Author: arekm Date: Wed Aug 31 17:35:06 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 3; drop separate libtinfo (split makes no sense and causes only problems)
---- Files affected: packages/ncurses: ncurses.spec (1.231 -> 1.232) ---- Diffs: ================================================================ Index: packages/ncurses/ncurses.spec diff -u packages/ncurses/ncurses.spec:1.231 packages/ncurses/ncurses.spec:1.232 --- packages/ncurses/ncurses.spec:1.231 Mon Jun 27 19:51:07 2011 +++ packages/ncurses/ncurses.spec Wed Aug 31 19:35:01 2011 @@ -21,7 +21,7 @@ Summary(uk.UTF-8): ncurses - нова бібліотека керування терміналами Name: ncurses Version: 5.9 -Release: 2 +Release: 3 License: distributable Group: Libraries Source0: ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz @@ -373,7 +373,6 @@ --with%{!?debug:out}-debug \ --with%{!?with_gpm:out}-gpm \ --without-profile \ - --with-termlib \ --with-largefile \ --with-ospeed=unsigned \ --disable-lp64 \ @@ -392,9 +391,8 @@ `[ "$t" != "widec" ] && echo --with-termlib=tinfo` \ `[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --includedir=%{_includedir}w` %else - `[ "$t" = "narrowc" ] && echo --with-termlib=tinfo` \ - `[ "$t" = "wideclowcolor" ] && echo --with-termlib=tinfow --enable-widec --disable-ext-colors --includedir=%{_includedir}wlc` \ - `[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --enable-ext-colors --includedir=%{_includedir}w` + `[ "$t" = "wideclowcolor" ] && echo --enable-widec --disable-ext-colors --includedir=%{_includedir}wlc` \ + `[ "$t" = "widec" ] && echo --enable-widec --enable-ext-colors --includedir=%{_includedir}w` %endif %{__make} -j1 @@ -418,9 +416,8 @@ ln -sf ../l/linux $RPM_BUILD_ROOT%{_datadir}/terminfo/c/console %if "%{pld_release}" != "ti" -mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfow.so.6* $RPM_BUILD_ROOT/%{_lib} mv -f $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.6* $RPM_BUILD_ROOT/%{_lib} -ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libtinfow.so.6.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.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 %else @@ -430,9 +427,8 @@ ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libcursesw.so ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncursesw.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libncursesw.so %endif -mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.so.* $RPM_BUILD_ROOT/%{_lib} mv -f $RPM_BUILD_ROOT%{_libdir}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib} -ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libtinfo.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libtinfo.so +ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libtinfo.so ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libcurses.so ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libncurses.so.*.*) $RPM_BUILD_ROOT%{_libdir}/libncurses.so @@ -448,10 +444,6 @@ rm $RPM_BUILD_ROOT%{_libdir}/libcursesw.a rm $RPM_BUILD_ROOT%{_mandir}/README.ncurses-non-english-man-pages -# FIXME: should be fixed properly -# fix too many w's -sed -i -e 's/tinfoww/tinfow/' $RPM_BUILD_ROOT%{_bindir}/ncurses*-config $RPM_BUILD_ROOT%{_pkgconfigdir}/*.pc - %clean rm -rf $RPM_BUILD_ROOT @@ -480,15 +472,9 @@ %if "%{pld_release}" != "ti" %attr(755,root,root) %ghost /%{_lib}/libncursesw.so.6 %endif -%attr(755,root,root) /%{_lib}/libtinfo.so.*.* -%attr(755,root,root) %ghost /%{_lib}/libtinfo.so.5 -%attr(755,root,root) /%{_lib}/libtinfow.so.*.* %if "%{pld_release}" != "ti" -%attr(755,root,root) %ghost /%{_lib}/libtinfow.so.6 %attr(755,root,root) %{_libdir}/libncursesw.so.*.* %attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5 -%attr(755,root,root) %{_libdir}/libtinfow.so.*.* -%attr(755,root,root) %ghost %{_libdir}/libtinfow.so.5 %else %attr(755,root,root) %ghost /%{_lib}/libtinfow.so.5 %attr(755,root,root) %ghost /%{_lib}/libncursesw.so.5 @@ -590,9 +576,7 @@ %files static %defattr(644,root,root,755) %{_libdir}/libncurses.a -%{_libdir}/libtinfo.a %{_libdir}/libncursesw.a -%{_libdir}/libtinfow.a %files ext %defattr(644,root,root,755) @@ -686,6 +670,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.232 2011/08/31 17:35:01 arekm +- rel 3; drop separate libtinfo (split makes no sense and causes only problems) + Revision 1.231 2011/06/27 17:51:07 arekm - release 2 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncurses/ncurses.spec?r1=1.231&r2=1.232&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
