Hello community, here is the log from the commit of package ncurses for openSUSE:Factory checked in at 2011-11-24 15:26:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ncurses (Old) and /work/SRC/openSUSE:Factory/.ncurses.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ncurses", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/ncurses/ncurses.changes 2011-11-23 19:37:16.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ncurses.new/ncurses.changes 2011-11-24 14:26:54.000000000 +0100 @@ -1,0 +2,6 @@ +Thu Nov 24 12:17:08 UTC 2011 - [email protected] + +- Use linker scripts to amke sure that libtinfo will be found + even if -ltinfo is missed on the linker command line + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ncurses.spec ++++++ --- /var/tmp/diff_new_pack.WyIAvz/_old 2011-11-24 14:26:55.000000000 +0100 +++ /var/tmp/diff_new_pack.WyIAvz/_new 2011-11-24 14:26:55.000000000 +0100 @@ -557,25 +557,47 @@ test -e "${lib}" || continue mv "${lib}" %{buildroot}/%{_lib}/ || continue done - for lib in %{buildroot}/%{_lib}/${model}.so.* ; do + for lib in %{buildroot}/%{_lib}/${model}.so.%{abi} ; do test -e "${lib}" || continue test -L "${lib}" || continue lib=${lib#%{buildroot}} - ln -sf ${lib} %{buildroot}%{_libdir}/${model}.so + lnk=%{buildroot}%{_libdir}/${model}.so + case "${lib##*/}" in + libncurses*) + rm -f ${lnk} + echo '/* GNU ld script */' > ${lnk} + echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk} + ;; + *) ln -sf ${lib} %{buildroot}%{_libdir}/${model}.so + esac done done + lnk=%{buildroot}%{_libdir}/libtermcap.so + echo '/* GNU ld script */' > ${lnk} + echo "INPUT(AS_NEEDED(-ltinfo))" >> ${lnk} chmod 0755 %{buildroot}/%{_lib}/lib*.so.* chmod 0755 %{buildroot}/%{_libdir}/lib*.so.* chmod a-x %{buildroot}/%{_libdir}/lib*.a +%if %abi < 6 if test -d %{buildroot}%{_libdir}/ncurses6 ; then mv %{buildroot}%{_libdir}/ncurses6/*.so.6* %{buildroot}%{_libdir}/ for lib in %{buildroot}%{_libdir}/ncurses6/*.so do - test -L "${lib}" || continue + lnk=$lib + lib=/%{_lib}/${lib##*/}.6 case "${lib##*/}" in - libncurses*) ln -sf /%{_lib}/${lib##*/}.6 ${lib} ;; - libtinfo*) ln -sf /%{_lib}/${lib##*/}.6 ${lib} ;; - *) ln -sf ../${lib##*/}.6 ${lib} ;; + libncurses*) + rm -f "${lnk}" + echo '/* GNU ld script */' > ${lnk} + echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk} + ;; + libtinfo*) + test -L "${lnk}" || continue + ln -sf ${lib} ${lnk} + ;; + *) + test -L "${lnk}" || continue + ln -sf ../${lib##*/} ${lnk} esac done for model in libncurses libncursest libncursesw libncursestw libtinfo @@ -588,13 +610,23 @@ test -e "${lib}" || continue test -L "${lib}" || continue lib=${lib#%{buildroot}} - ln -sf ${lib} %{buildroot}%{_libdir}/ncurses6/${model}.so + lnk=%{buildroot}%{_libdir}/ncurses6/${model}.so + case "${lib##*/}" in + libncurses*) + rm -f ${lnk} + echo '/* GNU ld script */' > ${lnk} + echo 'SEARCH_DIR(%{_libdir}/ncurses6)' >> ${lnk} + echo "INPUT(${lib} AS_NEEDED(-ltinfo))" >> ${lnk} + ;; + *) ln -sf ${lib} %{buildroot}%{_libdir}/ncurses6/${model}.so + esac done done chmod 0755 %{buildroot}/%{_lib}/lib*.so.6* chmod 0755 %{buildroot}/%{_libdir}/lib*.so.6* chmod a-x %{buildroot}/%{_libdir}/ncurses6/lib*.a fi +%endif test -n "%{buildroot}" || ldconfig -N mkdir -p %{buildroot}%{_defaultdocdir}/ncurses bzip2 -c misc/terminfo.src > misc/terminfo.src.bz2 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
