Attachment 4250 Details for Bug 10940 – Proper patch

Proper patch

ncurses.spec.diff (text/plain), 3.25 KB, created by Colin Guthrie on 2013-08-07 16:05:15 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Colin Guthrie

Created: 2013-08-07 16:05:15 CEST

Size: 3.25 KB

patch

obsolete

>Index: SPECS/ncurses.spec
>===================================================================
>--- SPECS/ncurses.spec	(revision 464324)
>+++ SPECS/ncurses.spec	(working copy)
>@@ -1,7 +1,7 @@
> %define rolluppatch   20110108
> %define patchdate     20110108
> %define version       5.9
>-%define release       %mkrel 10
>+%define release       %mkrel 10.2
> %define major         5
> %define majorminor    5.9
> %define utf8libname   %mklibname %{name}w %{major}
>@@ -32,6 +32,8 @@
> BuildRequires:	gpm-devel
> BuildRequires:	sharutils
> Conflicts:	%{name}-extraterms < 5.6-1.20070721.1
>+Obsoletes:	termcap <= 11.0.1-21.mga3
>+Provides:	termcap = %{version}-%{release}
> 
> %description
> The curses library routines are a terminal-independent method of updating
>@@ -82,6 +84,15 @@
> Provides:	lib%{name}-devel = %{version}-%{release}
> Provides:	%{name}-devel = %{version}-%{release}
> Obsoletes:	%mklibname -d %name 5
>+Obsoletes:	%{mklibname -d termcap} <= 2.0.8-53.mga3
>+Provides:	%{mklibname -d termcap} = %{version}-%{release}
>+Provides:	termcap-devel = %{version}-%{release}
>+%ifarch x86_64
>+Provides:	libtermcap-devel = %{version}-%{release}
>+Provides:	devel(libtermcap(64bit))
>+%else
>+Provides:	devel(libtermcap())
>+%endif
> 
> %description -n %{develname}
> The header files and libraries for developing applications that use
>@@ -142,7 +153,6 @@
> 	--enable-overwrite \\\
> 	--without-profile \\\
> 	--with-gpm \\\
>-	--enable-termcap \\\
> 	--enable-getcap \\\
> 	--enable-const \\\
> 	--enable-hard-tabs \\\
>@@ -165,7 +175,8 @@
> %configure2_5x \
> 	%{ncurses_options} \
> 	--includedir=%{_includedir}/ncurses \
>-	--disable-widec
>+	--disable-widec \
>+	--with-ticlib
> 
> %make -j1
> popd
>@@ -229,12 +240,17 @@
> 
> perl -ni -e 'BEGIN { open F, "%{name}.list"; /^%/ or $s{$_} = 1 foreach <F>; } print unless $s{$_}' %{name}-extraterms.list
> 
>-find %{buildroot}/%{_libdir} -name 'lib*.a' -not -type d -not -name "*_g.a" -not -name "*_p.a" -not -name "*w.a" | sed -e "s#^%{buildroot}##" > %{libname}-devel.list
>-
> %multiarch_includes %{buildroot}%{_includedir}/ncurses/curses.h
>-
> %multiarch_includes %{buildroot}%{_includedir}/ncursesw/curses.h
> 
>+# (cg) Note, fedora work differently here and add hacks to allow libncurses{,w}.so to be used
>+# without requiring -ltinfo when also using --no-add-needed, however we globally
>+# enable --as-needed so this will hopefully not be required.
>+
>+# Also we use a symlink here to provide this .so for compatibility.
>+ln -s libtinfo.so %{buildroot}%{_libdir}/libtermcap.so
>+
>+
> %files -f %{name}.list
> %defattr(-,root,root)
> %doc README ANNOUNCE
>@@ -250,6 +266,7 @@
> %attr(755,root,root) %{_libdir}/libmenu.so.*
> %attr(755,root,root) %{_libdir}/libncurses.so.*
> %attr(755,root,root) %{_libdir}/libpanel.so.*
>+%attr(755,root,root) %{_libdir}/libtic.so.*
> %attr(755,root,root) %{_libdir}/libtinfo.so.*
> 
> %files -n %{utf8libname}
>@@ -274,6 +291,9 @@
> %{_libdir}/libncurses.so
> %{_libdir}/libpanel.a
> %{_libdir}/libpanel.so
>+%{_libdir}/libtermcap.so
>+%{_libdir}/libtic.a
>+%{_libdir}/libtic.so
> %{_libdir}/libtinfo.a
> %{_libdir}/libtinfo.so
> %{_libdir}/pkgconfig/form.pc
>@@ -281,6 +301,7 @@
> %{_libdir}/pkgconfig/ncurses++.pc
> %{_libdir}/pkgconfig/ncurses.pc
> %{_libdir}/pkgconfig/panel.pc
>+%{_libdir}/pkgconfig/tic.pc
> %{_libdir}/pkgconfig/tinfo.pc
> %{_includedir}/ncurses
> %multiarch %{multiarch_includedir}/ncurses

Index: SPECS/ncurses.spec
===================================================================
--- SPECS/ncurses.spec	(revision 464324)
+++ SPECS/ncurses.spec	(working copy)
@@ -1,7 +1,7 @@
 %define rolluppatch   20110108
 %define patchdate     20110108
 %define version       5.9
-%define release       %mkrel 10
+%define release       %mkrel 10.2
 %define major         5
 %define majorminor    5.9
 %define utf8libname   %mklibname %{name}w %{major}
@@ -32,6 +32,8 @@
 BuildRequires:	gpm-devel
 BuildRequires:	sharutils
 Conflicts:	%{name}-extraterms < 5.6-1.20070721.1
+Obsoletes:	termcap <= 11.0.1-21.mga3
+Provides:	termcap = %{version}-%{release}
 
 %description
 The curses library routines are a terminal-independent method of updating
@@ -82,6 +84,15 @@
 Provides:	lib%{name}-devel = %{version}-%{release}
 Provides:	%{name}-devel = %{version}-%{release}
 Obsoletes:	%mklibname -d %name 5
+Obsoletes:	%{mklibname -d termcap} <= 2.0.8-53.mga3
+Provides:	%{mklibname -d termcap} = %{version}-%{release}
+Provides:	termcap-devel = %{version}-%{release}
+%ifarch x86_64
+Provides:	libtermcap-devel = %{version}-%{release}
+Provides:	devel(libtermcap(64bit))
+%else
+Provides:	devel(libtermcap())
+%endif
 
 %description -n %{develname}
 The header files and libraries for developing applications that use
@@ -142,7 +153,6 @@
 	--enable-overwrite \\\
 	--without-profile \\\
 	--with-gpm \\\
-	--enable-termcap \\\
 	--enable-getcap \\\
 	--enable-const \\\
 	--enable-hard-tabs \\\
@@ -165,7 +175,8 @@
 %configure2_5x \
 	%{ncurses_options} \
 	--includedir=%{_includedir}/ncurses \
-	--disable-widec
+	--disable-widec \
+	--with-ticlib
 
 %make -j1
 popd
@@ -229,12 +240,17 @@
 
 perl -ni -e 'BEGIN { open F, "%{name}.list"; /^%/ or $s{$_} = 1 foreach <F>; } print unless $s{$_}' %{name}-extraterms.list
 
-find %{buildroot}/%{_libdir} -name 'lib*.a' -not -type d -not -name "*_g.a" -not -name "*_p.a" -not -name "*w.a" | sed -e "s#^%{buildroot}##" > %{libname}-devel.list
-
 %multiarch_includes %{buildroot}%{_includedir}/ncurses/curses.h
-
 %multiarch_includes %{buildroot}%{_includedir}/ncursesw/curses.h
 
+# (cg) Note, fedora work differently here and add hacks to allow libncurses{,w}.so to be used
+# without requiring -ltinfo when also using --no-add-needed, however we globally
+# enable --as-needed so this will hopefully not be required.
+
+# Also we use a symlink here to provide this .so for compatibility.
+ln -s libtinfo.so %{buildroot}%{_libdir}/libtermcap.so
+
+
 %files -f %{name}.list
 %defattr(-,root,root)
 %doc README ANNOUNCE
@@ -250,6 +266,7 @@
 %attr(755,root,root) %{_libdir}/libmenu.so.*
 %attr(755,root,root) %{_libdir}/libncurses.so.*
 %attr(755,root,root) %{_libdir}/libpanel.so.*
+%attr(755,root,root) %{_libdir}/libtic.so.*
 %attr(755,root,root) %{_libdir}/libtinfo.so.*
 
 %files -n %{utf8libname}
@@ -274,6 +291,9 @@
 %{_libdir}/libncurses.so
 %{_libdir}/libpanel.a
 %{_libdir}/libpanel.so
+%{_libdir}/libtermcap.so
+%{_libdir}/libtic.a
+%{_libdir}/libtic.so
 %{_libdir}/libtinfo.a
 %{_libdir}/libtinfo.so
 %{_libdir}/pkgconfig/form.pc
@@ -281,6 +301,7 @@
 %{_libdir}/pkgconfig/ncurses++.pc
 %{_libdir}/pkgconfig/ncurses.pc
 %{_libdir}/pkgconfig/panel.pc
+%{_libdir}/pkgconfig/tic.pc
 %{_libdir}/pkgconfig/tinfo.pc
 %{_includedir}/ncurses
 %multiarch %{multiarch_includedir}/ncurses

Actions: View

Attachments on bug 10940: 4249 | 4250