Revision: 48602
Author: river
Date: 2009-03-19 19:17:06 +0000 (Thu, 19 Mar 2009)
Log Message:
-----------
TScairo: convert to new build system
Modified Paths:
--------------
trunk/tools/ts-specs/TScairo.spec
trunk/tools/ts-specs/base-specs/cairo.spec
Modified: trunk/tools/ts-specs/TScairo.spec
===================================================================
--- trunk/tools/ts-specs/TScairo.spec 2009-03-19 19:16:06 UTC (rev 48601)
+++ trunk/tools/ts-specs/TScairo.spec 2009-03-19 19:17:06 UTC (rev 48602)
@@ -42,17 +42,11 @@
export CXX="CC"
%include arch64.inc
-export CFLAGS="%optflags"
-export RPM_OPT_FLAGS="$CFLAGS"
-export LDFLAGS="%_ldflags -L/usr/sfw/lib/%_arch64
-R/usr/sfw/lib/%_arch64:%{_libdir}"
-export
PKG_CONFIG_PATH=/opt/ts/lib/%_arch64/pkgconfig:/usr/lib/%_arch64/pkgconfig:/usr/sfw/lib/%_arch64/pkgconfig
+%include stdenv.inc
%cairo64.build -d %name-%version/%_arch64
%include base.inc
-export LDFLAGS="%_ldflags -L/usr/sfw/lib -R/usr/sfw/lib:%{_libdir}"
-export CFLAGS="%optflags"
-export RPM_OPT_FLAGS="$CFLAGS"
-export
PKG_CONFIG_PATH=/opt/ts/lib/pkgconfig:/usr/lib/pkgconfig:/usr/sfw/lib/pkgconfig
+%include stdenv.inc
%cairo.build -d %name-%version/%{base_arch}
%install
@@ -69,25 +63,15 @@
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*
%files devel
-%defattr (-, root, bin)
-%dir %attr (0755, root, bin) %{_libdir}
+%defattr (-, root, root)
%{_libdir}/lib*.so
-%dir %attr (0755, root, other) %{_libdir}/pkgconfig
-%{_libdir}/pkgconfig/*
-%dir %attr(0755, root, sys) %{_datadir}
-%dir %attr(0755, root, other) %{_datadir}/gtk-doc
-%{_datadir}/gtk-doc/*
-%dir %attr (0755, root, bin) %{_includedir}
-%dir %attr (0755, root, bin) %{_includedir}/cairo
-%{_includedir}/cairo/*
-%dir %attr (0755, root, bin) %{_libdir}/%_arch64
+%{_libdir}/pkgconfig
+%{_datadir}/gtk-doc
+%{_includedir}/cairo
%{_libdir}/%_arch64/lib*.so
-%dir %attr (0755, root, other) %{_libdir}/%_arch64/pkgconfig
-%{_libdir}/%_arch64/pkgconfig/*
+%{_libdir}/%_arch64/pkgconfig
Modified: trunk/tools/ts-specs/base-specs/cairo.spec
===================================================================
--- trunk/tools/ts-specs/base-specs/cairo.spec 2009-03-19 19:16:06 UTC (rev
48601)
+++ trunk/tools/ts-specs/base-specs/cairo.spec 2009-03-19 19:17:06 UTC (rev
48602)
@@ -13,21 +13,13 @@
%build
-./configure --prefix=%{_prefix} \
- --bindir=%{_bindir} \
- --includedir=%{_includedir} \
- --mandir=%{_mandir} \
- --libdir=%{_libdir} \
- --disable-static \
- --enable-shared \
- --without-x \
- --enable-svg=yes \
- %{?configure_options}
+%_configure --without-x \
+ --enable-svg=yes
-gmake -j$CPUS all
+%_make 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
