rpms/libgsf/devel libgsf.spec,1.55,1.56

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728

Modified Files:
	libgsf.spec 
Log Message:
Resolves: rhbz#458353 gsf-office-thumbnailer doesn't work without ImageMagick's convert.


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- libgsf.spec	6 Mar 2008 09:38:51 -0000	1.55
+++ libgsf.spec	8 Aug 2008 13:11:59 -0000	1.56
@@ -4,7 +4,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.8
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 License: LGPLv2
 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2
@@ -24,7 +24,7 @@
 Summary: GNOME integration bits for libgsf
 Group: System Environment/Libraries
 Requires: libgsf = %{version}-%{release}
-Requires: gnome-vfs2
+Requires: gnome-vfs2, ImageMagick
 
 %description gnome
 Libraries for using libgsf in conjunction with the GNOME applications
@@ -75,18 +75,7 @@
   rm -r $RPM_BUILD_ROOT/%{python_py_sitearch}/gsf
 fi
 
-%post
-/sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas > /dev/null
-
-%preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas > /dev/null
-fi
+%post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
@@ -94,15 +83,26 @@
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README
 %{_libdir}/libgsf-1.so.*
-%{_bindir}/gsf-office-thumbnailer
-%{_mandir}/man1/gsf-office-thumbnailer.1.gz
-%{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas
 
 %files gnome
 %defattr(-,root,root,-)
 %{_libdir}/libgsf-gnome-1.so.*
+%{_bindir}/gsf-office-thumbnailer
+%{_mandir}/man1/gsf-office-thumbnailer.1.gz
+%{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas
 
-%post gnome -p /sbin/ldconfig
+%post gnome
+/sbin/ldconfig
+export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+gconftool-2 --makefile-install-rule \
+  %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas > /dev/null
+
+%preun gnome
+if [ "$1" -eq 0 ]; then
+    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+    gconftool-2 --makefile-uninstall-rule \
+      %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas > /dev/null
+fi
 
 %postun gnome -p /sbin/ldconfig
 
@@ -132,6 +132,10 @@
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Aug 08 2008 Caolán McNamara <caolanm at redhat.com> 1.14.8-2
+- Resolves: rhbz#458353 gsf-office-thumbnailer doesn't work without ImageMagick's convert.
+  Move that into the gnome subpackage
+
 * Thu Mar 06 2008 Caolan McNamara <caolanm at redhat.com> 1.14.8-1
 - latest version