Browse Source

fix libtinfo linking problem

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5284 ec354946-7b23-47d6-9f5a-488ba84defc7
daisuke 13 years ago
parent
commit
51007e60ac
1 changed files with 12 additions and 1 deletions
  1. 12 1
      n/ncurses/ncurses-vl.spec

+ 12 - 1
n/ncurses/ncurses-vl.spec

@@ -4,7 +4,7 @@ Name: ncurses
 Version: 5.9
 %define includedirw %{_includedir}/ncursesw
 %define build_compat32 %{?_with_compat32:1}%{!?_with_compat32:0}
-Release: 1%{?_dist_release}
+Release: 2%{?_dist_release}
 License: distributable
 Group: System Environment/Libraries
 URL: http://dickey.his.com/ncurses/ncurses.html
@@ -225,6 +225,13 @@ for l in $RPM_BUILD_ROOT%{_includedir}/*.h; do
     ln -s ../$(basename $l) $RPM_BUILD_ROOT%{_includedir}/ncursesw
 done
 
+# don't require -ltinfo when linking with --no-add-needed
+for l in $RPM_BUILD_ROOT%{_libdir}/libncurses{,w}.so; do
+    soname=$(basename $(readlink $l))
+    rm -f $l
+    echo "INPUT($soname -ltinfo)" > $l
+done
+	     
 rm -f $RPM_BUILD_ROOT%{_libdir}/libcurses{,w}.so
 echo "INPUT(-lncurses)" > $RPM_BUILD_ROOT%{_libdir}/libcurses.so
 echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
@@ -232,6 +239,7 @@ echo "INPUT(-lncursesw)" > $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
 echo "INPUT(-ltinfo)" > $RPM_BUILD_ROOT%{_libdir}/libtermcap.so
 
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/terminfo
+#rm -f $RPM_BUILD_ROOT%{_libdir}/pkgconfig/{*_g,ncurses++*}.pc
 
 
 %post -p /sbin/ldconfig
@@ -314,6 +322,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Dec 14 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 5.9-2
+- don't require -ltinfo when linking with --no-add-needed
+
 * Fri Sep 09 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 5.9-1
 - update to 5.9 + 20110716
 - update all patches