diff --git a/.gitignore b/.gitignore index 84aaacf..308de43 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libgsf-1.14.21.tar.bz2 +/libgsf-1.14.22.tar.xz diff --git a/libgsf.spec b/libgsf.spec index 4bb6e33..df79874 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -7,52 +7,32 @@ distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} Summary: GNOME Structured File library Name: libgsf -Version: 1.14.21 -Release: 3%{?dist} +Version: 1.14.22 +Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2 -Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2 +Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.xz URL: http://www.gnome.org/projects/libgsf/ Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: glib2-devel, perl-XML-Parser BuildRequires: libtool, libxml2-devel, glib2-devel, bzip2-devel, gettext BuildRequires: libbonobo-devel, pygtk2-devel, intltool, gnome-vfs2-devel +Obsoletes: libgsf-gnome < 1.14.22 %description A library for reading and writing structured files (e.g. MS OLE and Zip) -%package gnome -Summary: GNOME integration bits for libgsf -Group: System Environment/Libraries -Requires: libgsf = %{version}-%{release} -Requires: gnome-vfs2 -Requires(pre): GConf2 -Requires(post): GConf2 -Requires(preun): GConf2 - -%description gnome -Libraries for using libgsf in conjunction with the GNOME applications - %package devel Summary: Support files necessary to compile applications with libgsf Group: Development/Libraries Requires: libgsf = %{version}-%{release}, glib2-devel, libxml2-devel Requires: pkgconfig +Obsoletes: libgsf-gnome-devel < 1.14.22 %description devel Libraries, headers, and support files necessary to compile applications using libgsf. -%package gnome-devel -Summary: Support files necessary to compile applications with libgsf and GNOME -Group: Development/Libraries -Requires: libgsf-gnome = %{version}-%{release} -Requires: libgsf-devel = %{version}-%{release} - -%description gnome-devel -Libraries, headers, and support files necessary to compile applications using -libgsf and GNOME libraries - %package python Summary: Python bindings for libgsf Group: Development/Libraries @@ -90,28 +70,9 @@ fi %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB README %{_libdir}/libgsf-1.so.* - -%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 -/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 +%{_datadir}/thumbnailers/gsf-office.thumbnailer %files devel %defattr(-,root,root,-) @@ -125,12 +86,6 @@ fi %{_mandir}/man1/gsf.1.gz %{_mandir}/man1/gsf-vba-dump.1.gz -%files gnome-devel -%defattr(-,root,root,-) -%{_libdir}/libgsf-gnome-1.so -%{_libdir}/pkgconfig/libgsf-gnome-1.pc -%{_includedir}/libgsf-1/gsf-gnome - %files python %defattr(-,root,root,-) %{python_sitearch}/gsf/ @@ -139,6 +94,9 @@ fi rm -rf $RPM_BUILD_ROOT %changelog +* Fri Mar 09 2012 Caolán McNamara 1.14.22-1 +- latest version + * Fri Jan 13 2012 Fedora Release Engineering - 1.14.21-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index e0e0832..51ec1e6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b702648b853402554c97d75405c60d3 libgsf-1.14.21.tar.bz2 +5d4d26767ca5de505435f5fabee2e4c1 libgsf-1.14.22.tar.xz