diff --git a/libgsf.spec b/libgsf.spec index 600325b..08bced6 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -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 @@ A library for reading and writing structured files (eg MS OLE and Zip) 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 @@ if [ "%{python_py_sitearch}" != "%{python_lib_sitearch}" ]; then 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 @@ fi %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 @@ fi rm -r $RPM_BUILD_ROOT %changelog +* Fri Aug 08 2008 Caolán McNamara 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 1.14.8-1 - latest version