SPECS: ncurses.spec - drop ext-colors support for Titanium, too much proble...
hawk
hawk at pld-linux.org
Mon Apr 20 22:31:33 CEST 2009
Author: hawk Date: Mon Apr 20 20:31:33 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- drop ext-colors support for Titanium, too much problems and no gain
---- Files affected:
SPECS:
ncurses.spec (1.192 -> 1.193)
---- Diffs:
================================================================
Index: SPECS/ncurses.spec
diff -u SPECS/ncurses.spec:1.192 SPECS/ncurses.spec:1.193
--- SPECS/ncurses.spec:1.192 Mon Apr 20 15:18:20 2009
+++ SPECS/ncurses.spec Mon Apr 20 22:31:27 2009
@@ -348,7 +348,11 @@
CFLAGS="%{rpmcflags} -DPURE_TERMINFO -D_FILE_OFFSET_BITS=64"
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 \
@@ -371,9 +375,14 @@
--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" = "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`
+%endif
%{__make} -j1
@@ -384,7 +393,11 @@
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
@@ -399,7 +412,9 @@
ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libcursesw.a
ln -sf libncursesw.so $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
+%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}
@@ -431,10 +446,14 @@
%attr(755,root,root) %ghost /%{_lib}/libtinfo.so.5
%attr(755,root,root) %{_libdir}/libncursesw.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libncursesw.so.5
+%if "%{pld_release}" != "ti"
%attr(755,root,root) %ghost %{_libdir}/libncursesw.so.6
+%endif
%attr(755,root,root) %{_libdir}/libtinfow.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libtinfow.so.5
+%if "%{pld_release}" != "ti"
%attr(755,root,root) %ghost %{_libdir}/libtinfow.so.6
+%endif
%{_datadir}/tabset
@@ -486,7 +505,11 @@
%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
@@ -530,6 +553,14 @@
%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.*.*
@@ -542,6 +573,7 @@
%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)
@@ -611,6 +643,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.193 2009/04/20 20:31:27 hawk
+- drop ext-colors support for Titanium, too much problems and no gain
+
Revision 1.192 2009/04/20 13:18:20 baggins
- no parallel build?
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ncurses.spec?r1=1.192&r2=1.193&f=u
More information about the pld-cvs-commit
mailing list