Revision: 48596
Author: river
Date: 2009-03-19 19:10:52 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
TSlibedit: convert to current build system
Modified Paths:
--------------
trunk/tools/ts-specs/TSlibedit.spec
trunk/tools/ts-specs/base-specs/libedit.spec
Modified: trunk/tools/ts-specs/TSlibedit.spec
===================================================================
--- trunk/tools/ts-specs/TSlibedit.spec 2009-03-19 19:10:18 UTC (rev 48595)
+++ trunk/tools/ts-specs/TSlibedit.spec 2009-03-19 19:10:52 UTC (rev 48596)
@@ -30,25 +30,10 @@
%libedit.prep -d %name-%version/%{base_arch}
%build
-CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
-if test "x$CPUS" = "x" -o $CPUS = 0; then
- CPUS=1
-fi
-
-export CC="cc"
-export CXX="CC"
-export CPPFLAGS="-I/usr/sfw/include"
-export MSGFMT="/usr/bin/msgfmt"
-
%include arch64.inc
-export CFLAGS="%optflags -m64 -I/usr/sfw/include -DANSICPP
-L/usr/sfw/lib/%_arch64"
-export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="-m64 -L/usr/sfw/lib/%_arch64 -R/usr/sfw/lib/%_arch64"
%libedit64.build -d %name-%version/%_arch64
+
%include base.inc
-export LDFLAGS="-L/usr/sfw/lib -R/usr/sfw/lib"
-export CFLAGS="%optflags -I/usr/sfw/include -DANSICPP -L/usr/sfw/lib"
-export RPM_OPT_FLAGS="$CFLAGS"
%libedit.build -d %name-%version/%{base_arch}
%install
@@ -65,31 +50,17 @@
rm -rf $RPM_BUILD_ROOT
%files
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_libdir}
+%defattr (-, root, root)
%{_libdir}/lib*.so.*
-%dir %attr (0755, root, bin) %{_libdir}/%_arch64
%{_libdir}/%_arch64/lib*.so.*
-%dir %attr(0755, root, sys) %{_datadir}
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/man5
%{_mandir}/man5/*
%files devel
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_includedir}
+%defattr (-, root, root)
%{_includedir}/*.h
-%dir %attr (0755, root, bin) %{_includedir}/editline
%{_includedir}/editline/*.h
-%dir %attr (0755, root, bin) %{_libdir}
%{_libdir}/*.so
-%dir %attr (0755, root, bin) %{_libdir}/%_arch64
%{_libdir}/%_arch64/*.so
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
%{_libdir}/pkgconfig/*.pc
-%dir %attr (0755, root, other) %{_libdir}/%_arch64/pkgconfig
%{_libdir}/%_arch64/pkgconfig/*.pc
-%dir %attr(0755, root, sys) %{_datadir}
-%dir %attr(0755, root, bin) %{_mandir}
-%dir %attr(0755, root, bin) %{_mandir}/man3
%{_mandir}/man3/*
Modified: trunk/tools/ts-specs/base-specs/libedit.spec
===================================================================
--- trunk/tools/ts-specs/base-specs/libedit.spec 2009-03-19 19:10:18 UTC
(rev 48595)
+++ trunk/tools/ts-specs/base-specs/libedit.spec 2009-03-19 19:10:52 UTC
(rev 48596)
@@ -13,19 +13,14 @@
%build
+%include stdenv.inc
PATH=/opt/ts/bin:$PATH
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --includedir=%{_includedir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --enable-rpath \
+%_configure --enable-rpath
+%_make
-gmake -j$CPUS all
-
%install
-gmake DESTDIR=${RPM_BUILD_ROOT} install
+%_make DESTDIR=${RPM_BUILD_ROOT} install
%clean
rm -rf $RPM_BUILD_ROOT
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
