packages (NO_LIBTINFO): ncurses/ncurses.spec - new branch with completly dr...

[hawk]

Author: hawk                         Date: Sun Jan  1 19:41:59 2012 GMT
Module: packages                      Tag: NO_LIBTINFO
---- Log message:
- new branch with completly dropped libtinfo symlinks (they make ldconfig
  creating symlinks to libtinfo* instead of libncurses* which causes
  binaries still linking with libtinfo* despite it no longer exists)

---- Files affected:
packages/ncurses:
   ncurses.spec (1.241 -> 1.241.2.1) 

---- Diffs:

================================================================
Index: packages/ncurses/ncurses.spec
diff -u packages/ncurses/ncurses.spec:1.241 packages/ncurses/ncurses.spec:1.241.2.1
--- packages/ncurses/ncurses.spec:1.241	Sat Nov  5 17:28:02 2011
+++ packages/ncurses/ncurses.spec	Sun Jan  1 20:41:53 2012
@@ -21,7 +21,7 @@
 Summary(uk.UTF-8):	ncurses - нова бібліотека керування терміналами
 Name:		ncurses
 Version:	5.9
-Release:	10
+Release:	11
 License:	distributable
 Group:		Libraries
 Source0:	ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz
@@ -111,16 +111,6 @@
 %{?with_ada:BuildRequires:	m4}
 BuildRequires:	pkgconfig
 BuildRequires:	sharutils
-# for compatibility with old PLD packages
-%ifarch %{x8664} ppc64 sparc64 s390x
-Provides:	libtinfo.so.5()(64bit)
-Provides:	libtinfow.so.5()(64bit)
-Provides:	libtinfow.so.6()(64bit)
-%else
-Provides:	libtinfo.so.5
-Provides:	libtinfow.so.5
-Provides:	libtinfow.so.6
-%endif
 Obsoletes:	libncurses5
 Conflicts:	terminfo < 5.4-0.6
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -472,8 +462,6 @@
 ln -sf ../l/linux $RPM_BUILD_ROOT%{_datadir}/terminfo/c/console
 
 mv -f $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.6* $RPM_BUILD_ROOT/%{_lib}
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libtinfo.so
-ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so
 ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
 mv -f $RPM_BUILD_ROOT%{_libdir}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib}
@@ -484,10 +472,6 @@
 
 # binary compatibility for packages using libncursesw.so.5 (without ext-colors)
 cp -a obj-wideclowcolor/lib/libncursesw.so.5* $RPM_BUILD_ROOT%{_libdir}
-# binary compatibility for packages usign libtinfo.so.5/libtinfow.so.5/libtinfow.so.6
-ln -sf $(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.5.*) $RPM_BUILD_ROOT/%{_lib}/libtinfo.so.5
-ln -sf $(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.6.*) $RPM_BUILD_ROOT/%{_lib}/libtinfow.so.6
-ln -sf $(basename $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so.5
 
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
@@ -523,9 +507,6 @@
 %attr(755,root,root) %ghost /%{_lib}/libncursesw.so.6
 %attr(755,root,root) %{_libdir}/libncursesw.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5
-%attr(755,root,root) /%{_lib}/libtinfo.so.5
-%attr(755,root,root) /%{_lib}/libtinfow.so.6
-%attr(755,root,root) %{_libdir}/libtinfow.so.5
 
 %{_datadir}/tabset
 
@@ -594,10 +575,8 @@
 %attr(755,root,root) %{_bindir}/ncursesw6-config
 %attr(755,root,root) %{_libdir}/libcurses.so
 %attr(755,root,root) %{_libdir}/libncurses.so
-%attr(755,root,root) %{_libdir}/libtinfo.so
 %attr(755,root,root) %{_libdir}/libcursesw.so
 %attr(755,root,root) %{_libdir}/libncursesw.so
-%attr(755,root,root) %{_libdir}/libtinfow.so
 %dir %{_includedir}
 %{_includedir}/curses.h
 %{_includedir}/eti.h
@@ -967,6 +946,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.241.2.1  2012/01/01 19:41:53  hawk
+- new branch with completly dropped libtinfo symlinks (they make ldconfig
+  creating symlinks to libtinfo* instead of libncurses* which causes
+  binaries still linking with libtinfo* despite it no longer exists)
+
 Revision 1.241  2011/11/05 16:28:02  qboosh
 - added fix-nonunicode-breakage patch (fixes line drawing on linux console in non-utf-8 mode)
 - provide libtinfo[w].so.[56] symlinks for compatibility with old binary packages
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncurses/ncurses.spec?r1=1.241&r2=1.241.2.1&f=u