SPECS: ncurses.spec - cleanups
arekm
arekm at pld-linux.org
Mon Apr 20 14:31:48 CEST 2009
Author: arekm Date: Mon Apr 20 12:31:48 2009 GMT
Module: SPECS Tag: HEAD
---- Log message:
- cleanups
---- Files affected:
SPECS:
ncurses.spec (1.189 -> 1.190)
---- Diffs:
================================================================
Index: SPECS/ncurses.spec
diff -u SPECS/ncurses.spec:1.189 SPECS/ncurses.spec:1.190
--- SPECS/ncurses.spec:1.189 Mon Apr 20 14:26:52 2009
+++ SPECS/ncurses.spec Mon Apr 20 14:31:43 2009
@@ -348,36 +348,7 @@
CFLAGS="%{rpmcflags} -DPURE_TERMINFO -D_FILE_OFFSET_BITS=64"
cp -f /usr/share/automake/config.sub .
-# build ABI5 wide library first
-install -d obj-widec-ABI5
-cd obj-widec-ABI5
-../%configure \
- --with-install-prefix=$RPM_BUILD_ROOT \
- --with-normal \
- --with-shared \
- --with%{!?with_ada:out}-ada \
- --with%{!?with_cxx:out}-cxx \
- --with%{!?with_cxx:out}-cxx-binding \
- --with%{!?debug:out}-debug \
- --with%{!?with_gpm:out}-gpm \
- --without-profile \
- --with-termlib \
- --with-largefile \
- --disable-lp64 \
- --with-chtype='long' \
- --with-mmask-t='long' \
- --with-manpage-aliases \
- --with-manpage-format=normal \
- --without-manpage-symlinks \
- --with-ada-include=%{_libdir}/gcc/$gcc_target/$gcc_version/adainclude/ \
- --with-ada-objects=%{_libdir}/gcc/$gcc_target/$gcc_version/adalib/ \
- --with-termlib=tinfow --enable-widec --includedir=%{_includedir}w
-
-%{__make}
-
-cd ..
-
-for t in narrowc widec; do
+for t in narrowc wideclowcolor widec; do
install -d obj-$t
cd obj-$t
../%configure \
@@ -400,8 +371,9 @@
--without-manpage-symlinks \
--with-ada-include=%{_libdir}/gcc/$gcc_target/$gcc_version/adainclude/ \
--with-ada-objects=%{_libdir}/gcc/$gcc_target/$gcc_version/adalib/ \
- `[ "$t" != "widec" ] && echo --with-termlib=tinfo` \
- `[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --enable-ext-colors --includedir=%{_includedir}w`
+ `[ "$t" = "narrowc" ] && echo --with-termlib=tinfo` \
+ `[ "$t" = "wideclowcolor" ] && echo --with-termlib=tinfow --enable-widec --enable-ext-colors --includedir=%{_includedir}wlc` \
+ `[ "$t" = "widec" ] && echo --with-termlib=tinfow --enable-widec --disable-ext-colors --includedir=%{_includedir}w`
%{__make}
@@ -427,7 +399,7 @@
ln -sf libncursesw.a $RPM_BUILD_ROOT%{_libdir}/libcursesw.a
ln -sf libncursesw.so $RPM_BUILD_ROOT%{_libdir}/libcursesw.so
-cp -a obj-widec-ABI5/lib/lib*w.so.5* $RPM_BUILD_ROOT%{_libdir}
+cp -a obj-wideclowcolor/lib/lib*w.so.5* $RPM_BUILD_ROOT%{_libdir}
bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -639,6 +611,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.190 2009/04/20 12:31:43 arekm
+- cleanups
+
Revision 1.189 2009/04/20 12:26:52 baggins
- rel 11
- provide ABI5 widechar libs
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ncurses.spec?r1=1.189&r2=1.190&f=u
More information about the pld-cvs-commit
mailing list