packages: librsvg/librsvg.spec - removed .la, package is pc-enabled, - what...

[gotar]

Author: gotar                        Date: Sun Nov 14 13:14:10 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- removed .la, package is pc-enabled,
- what was that 'exit 0' in %post? replaced with || :
- sorted, libraries need to be separated for multilib

---- Files affected:
packages/librsvg:
   librsvg.spec (1.146 -> 1.147) 

---- Diffs:

================================================================
Index: packages/librsvg/librsvg.spec
diff -u packages/librsvg/librsvg.spec:1.146 packages/librsvg/librsvg.spec:1.147
--- packages/librsvg/librsvg.spec:1.146	Wed Oct 13 21:00:12 2010
+++ packages/librsvg/librsvg.spec	Sun Nov 14 14:14:05 2010
@@ -1,5 +1,7 @@
 # $Revision$, $Date$
 #
+# TODO:	- separate libs subpackage, current scheme conflicts on multilib
+#
 # Conditional build
 %bcond_without	apidocs		# disable gtk-doc
 %bcond_without	libgsf		# build without libgsf (used for run-time decompression)
@@ -37,8 +39,8 @@
 BuildRequires:	sed >= 4.0
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	gdk-pixbuf2
-Requires:	glib2 >= 1:2.24.0
 Requires:	gdk-pixbuf2 >= 2.0
+Requires:	glib2 >= 1:2.24.0
 Requires:	gtk+2 >= 2:2.16.0
 %{?with_libcroco:Requires:	libcroco >= 0.6.1}
 %{?with_libgsf:Requires:	libgsf >= 1.14.4}
@@ -171,6 +173,7 @@
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gtk-2.0/2.*/engines/*.{la,a}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/*.{la,a}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/librsvg-2.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -178,8 +181,7 @@
 %post
 /sbin/ldconfig
 umask 022
-%{_bindir}/gdk-pixbuf-query-loaders%{pqext} --update-cache
-exit 0
+%{_bindir}/gdk-pixbuf-query-loaders%{pqext} --update-cache || :
 
 %postun
 /sbin/ldconfig
@@ -194,10 +196,10 @@
 %attr(755,root,root) %{_bindir}/rsvg
 %attr(755,root,root) %{_bindir}/rsvg-convert
 %attr(755,root,root) %{_bindir}/rsvg-view
+%attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader-svg.so
+%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/libsvg.so
 %attr(755,root,root) %{_libdir}/librsvg-2.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/librsvg-2.so.2
-%attr(755,root,root) %{_libdir}/gtk-2.0/2.*/engines/libsvg.so
-%attr(755,root,root) %{_libdir}/gdk-pixbuf-2.0/2.*.*/loaders/libpixbufloader-svg.so
 %{_datadir}/themes/bubble
 %{_mandir}/man1/rsvg.1*
 %{_pixmapsdir}/svg-viewer.svg
@@ -205,7 +207,6 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/librsvg-2.so
-%{_libdir}/librsvg-2.la
 %{_pkgconfigdir}/librsvg-2.0.pc
 %{_includedir}/librsvg-2.0
 
@@ -227,6 +228,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2010/11/14 13:14:05  gotar
+- removed .la, package is pc-enabled,
+- what was that 'exit 0' in %post? replaced with || :
+- sorted, libraries need to be separated for multilib
+
 Revision 1.146  2010/10/13 19:00:12  qboosh
 - gdk-pixbuf2 deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/librsvg/librsvg.spec?r1=1.146&r2=1.147&f=u