Author: colin
Date: Wed Nov 22 17:23:01 2006
New Revision: 86240

Modified:
   packages/cooker/librsvg/current/SPECS/librsvg.spec

Log:
Libify the engines for the benefit of x86_64 users

Modified: packages/cooker/librsvg/current/SPECS/librsvg.spec
==============================================================================
--- packages/cooker/librsvg/current/SPECS/librsvg.spec  (original)
+++ packages/cooker/librsvg/current/SPECS/librsvg.spec  Wed Nov 22 17:23:01 2006
@@ -6,16 +6,13 @@
 
 Name:          librsvg
 Summary:       Raph's SVG library
-Version: 2.16.1
-Release:       %mkrel 1
+Version:       2.16.1
+Release:       %mkrel 2
 License:       LGPL
 Group:         System/Libraries
 Source0:       
ftp://ftp.gnome.org/pub/GNOME/sources/%name/%{name}-%{version}.tar.bz2
 URL:           http://librsvg.sourceforge.net/
-Requires(post):        gtk+2.0 >= %gtkver
-Requires(postun): gtk+2.0 >= %gtkver
-Requires(post):        %{lib_name} >= %{version}
-Requires:      gtk+2.0 >= %gtkver
+Requires:      %{lib_name} >= %{version}
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: gtk+2-devel >= 2.4.0
 BuildRequires: libart_lgpl-devel
@@ -30,25 +27,45 @@
 %description
 A library that uses libart and pango to render svg files.
 
+#-----------------------------------------------------------
+
 %package -n %{lib_name}
 Summary:       Raph's SVG library
 Group:         System/Libraries
-Provides:   %{name}%{api_version} = %{version}-%{release}
+Provides:      %{name}%{api_version} = %{version}-%{release}
+Requires:              gtk+2.0 >= %gtkver
+Requires(post):                gtk+2.0 >= %gtkver
+Requires(postun):      gtk+2.0 >= %gtkver
 
 %description -n %{lib_name}
 A library that uses libart and pango to render svg files.
 
+%post -n %{lib_name}
+/sbin/ldconfig
+%{_bindir}/gdk-pixbuf-query-loaders %_lib > 
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders.%_lib
+
+%postun -n %{lib_name}
+/sbin/ldconfig
+#only update on uninstall, upgrade will be done by post of new package
+if [ "$1" = "0" -a -x %{_bindir}/gdk-pixbuf-query-loaders ]; then 
+  [ -x %{_bindir}/gdk-pixbuf-query-loaders ] && 
%{_bindir}/gdk-pixbuf-query-loaders %_lib > 
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders.%_lib
+fi
+
+#-----------------------------------------------------------
+
 %package -n %{lib_name}-devel
 Summary:       Libraries and include files for developing with librsvg
 Group:         Development/C
 Requires:      %{lib_name} = %{version}
-Provides:   %{name}%{api_version}-devel = %{version}-%{release}
-Provides:   %{name}-devel = %{version}-%{release}
+Provides:      %{name}%{api_version}-devel = %{version}-%{release}
+Provides:      %{name}-devel = %{version}-%{release}
 
 %description -n %{lib_name}-devel
 This package provides the necessary development libraries and include
 files to allow you to develop with librsvg.
 
+#-----------------------------------------------------------
+
 %package mozilla
 Summary:        Mozilla plugin for displaying SVG files
 Group:          Networking/WWW
@@ -57,6 +74,7 @@
 This package provides the necessary development libraries and include
 files to allow you to develop with librsvg.
 
+#-----------------------------------------------------------
 
 %prep
 %setup -q
@@ -79,31 +97,21 @@
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
 
-%post
-%{_bindir}/gdk-pixbuf-query-loaders %_lib > 
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders.%_lib
 
-%postun
-#only update on uninstall, upgrade will be done by post of new package
-if [ "$1" = "0" -a -x %{_bindir}/gdk-pixbuf-query-loaders ]; then 
-  [ -x %{_bindir}/gdk-pixbuf-query-loaders ] && 
%{_bindir}/gdk-pixbuf-query-loaders %_lib > 
%{_sysconfdir}/gtk-2.0/gdk-pixbuf.loaders.%_lib
-fi
-
-%post -p /sbin/ldconfig -n %{lib_name}
-
-%postun -p /sbin/ldconfig -n %{lib_name}
+#-----------------------------------------------------------
 
 %files 
 %defattr(-, root, root)
 %doc AUTHORS COPYING COPYING.LIB ChangeLog NEWS README
 %{_bindir}/rsvg*
-%{_libdir}/gtk-2.0/%{gtkbinaryver}/engines/*.so
-%{_libdir}/gtk-2.0/%{gtkbinaryver}/loaders/*.so
 %{_datadir}/pixmaps/*
 %{_mandir}/man1/*
 
 %files -n %{lib_name}
 %defattr(-, root, root)
 %{_libdir}/librsvg-%{api_version}.so.%{lib_major}*
+%{_libdir}/gtk-2.0/%{gtkbinaryver}/engines/*.so
+%{_libdir}/gtk-2.0/%{gtkbinaryver}/loaders/*.so
 
 %files -n %{lib_name}-devel
 %defattr(-,root,root)

Reply via email to