Author: hawk Date: Wed Oct 19 13:30:30 2011 GMT Module: packages Tag: HEAD ---- Log message: - dropped Titanium specific stuff
---- Files affected: packages/ncurses: ncurses.spec (1.237 -> 1.238) ---- Diffs: ================================================================ Index: packages/ncurses/ncurses.spec diff -u packages/ncurses/ncurses.spec:1.237 packages/ncurses/ncurses.spec:1.238 --- packages/ncurses/ncurses.spec:1.237 Tue Sep 13 12:38:31 2011 +++ packages/ncurses/ncurses.spec Wed Oct 19 15:30:24 2011 @@ -21,7 +21,7 @@ Summary(uk.UTF-8): ncurses - нова бібліотека керування терміналами Name: ncurses Version: 5.9 -Release: 6 +Release: 7 License: distributable Group: Libraries Source0: ftp://dickey.his.com/ncurses/%{name}-%{version}.tar.gz @@ -386,11 +386,7 @@ export PKG_CONFIG_LIBDIR=%{_libdir}/pkgconfig cp -f /usr/share/automake/config.sub . -%if "%{pld_release}" == "ti" -for t in narrowc widec; do -%else for t in narrowc wideclowcolor widec; do -%endif install -d obj-$t cd obj-$t ../%configure \ @@ -417,13 +413,8 @@ --without-manpage-symlinks \ --with-ada-include=%{_libdir}/gcc/$gcc_target/$gcc_version/adainclude/ \ --with-ada-objects=%{_libdir}/gcc/$gcc_target/$gcc_version/adalib/ \ -%if "%{pld_release}" == "ti" - `[ "$t" != "widec" ] && echo --with-termlib=tinfo` \ - `[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --includedir=%{_includedir}w` -%else `[ "$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 @@ -434,41 +425,25 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{/%{_lib},%{_mandir}} -%if "%{pld_release}" == "ti" -for t in widec narrowc; do -%else for t in narrowc widec; do -%endif %{__make} -C obj-$t install \ INSTALL_PREFIX=$RPM_BUILD_ROOT done ln -sf ../l/linux $RPM_BUILD_ROOT%{_datadir}/terminfo/c/console -%if "%{pld_release}" != "ti" 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 -%else -mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfow.so.5* $RPM_BUILD_ROOT/%{_lib} -mv -f $RPM_BUILD_ROOT%{_libdir}/libtinfo.so.* $RPM_BUILD_ROOT/%{_lib} -mv -f $RPM_BUILD_ROOT%{_libdir}/libncursesw.so.5* $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}/libtinfow.so.5.*) $RPM_BUILD_ROOT%{_libdir}/libtinfow.so -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}/libncurses.so.* $RPM_BUILD_ROOT/%{_lib} 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 ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libcursesw.a -%if "%{pld_release}" != "ti" cp -a obj-wideclowcolor/lib/lib*w.so.5* $RPM_BUILD_ROOT%{_libdir} -%endif bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} @@ -501,21 +476,9 @@ %attr(755,root,root) /%{_lib}/libncurses.so.*.* %attr(755,root,root) %ghost /%{_lib}/libncurses.so.5 %attr(755,root,root) /%{_lib}/libncursesw.so.*.* -%if "%{pld_release}" != "ti" %attr(755,root,root) %ghost /%{_lib}/libncursesw.so.6 -%endif -%if "%{pld_release}" == "ti" -%attr(755,root,root) /%{_lib}/libtinfo.so.*.* -%attr(755,root,root) %ghost /%{_lib}/libtinfo.so.5 -%attr(755,root,root) /%{_lib}/libtinfow.so.*.* -%endif -%if "%{pld_release}" != "ti" %attr(755,root,root) %{_libdir}/libncursesw.so.*.* %attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5 -%else -%attr(755,root,root) %ghost /%{_lib}/libtinfow.so.5 -%attr(755,root,root) %ghost /%{_lib}/libncursesw.so.5 -%endif %{_datadir}/tabset @@ -569,11 +532,7 @@ %defattr(644,root,root,755) %doc doc/html/ncurses-intro.html %attr(755,root,root) %{_bindir}/ncurses5-config -%if "%{pld_release}" == "ti" -%attr(755,root,root) %{_bindir}/ncursesw5-config -%else %attr(755,root,root) %{_bindir}/ncursesw6-config -%endif %attr(755,root,root) %{_libdir}/libcurses.so %attr(755,root,root) %{_libdir}/libncurses.so %attr(755,root,root) %{_libdir}/libtinfo.so @@ -614,21 +573,9 @@ %defattr(644,root,root,755) %{_libdir}/libncurses.a %{_libdir}/libncursesw.a -%if "%{pld_release}" == "ti" -%{_libdir}/libtinfo.a -%{_libdir}/libtinfow.a -%endif %files ext %defattr(644,root,root,755) -%if "%{pld_release}" == "ti" -%attr(755,root,root) %{_libdir}/libform.so.* -%attr(755,root,root) %{_libdir}/libmenu.so.* -%attr(755,root,root) %{_libdir}/libpanel.so.* -%attr(755,root,root) %{_libdir}/libformw.so.* -%attr(755,root,root) %{_libdir}/libmenuw.so.* -%attr(755,root,root) %{_libdir}/libpanelw.so.* -%else %attr(755,root,root) %{_libdir}/libform.so.*.* %attr(755,root,root) %ghost %{_libdir}/libform.so.[56] %attr(755,root,root) %{_libdir}/libmenu.so.*.* @@ -641,7 +588,6 @@ %attr(755,root,root) %ghost %{_libdir}/libmenuw.so.[56] %attr(755,root,root) %{_libdir}/libpanelw.so.*.* %attr(755,root,root) %ghost %{_libdir}/libpanelw.so.[56] -%endif %files ext-devel %defattr(644,root,root,755) @@ -711,6 +657,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.238 2011/10/19 13:30:24 hawk +- dropped Titanium specific stuff + Revision 1.237 2011/09/13 10:38:31 lisu - fix build on Titanium with separated tinfo - rel 6 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ncurses/ncurses.spec?r1=1.237&r2=1.238&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
