diff --git a/.gitignore b/.gitignore index 5e426ed..c7b649b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/libgsf-1.14.27.tar.xz +/libgsf-1.*.tar.xz diff --git a/libgsf.spec b/libgsf.spec index 2a4d658..a7ca2a6 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -1,15 +1,20 @@ Summary: GNOME Structured File library Name: libgsf -Version: 1.14.27 +Version: 1.14.28 Release: 1%{?dist} Group: System Environment/Libraries License: LGPLv2 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 + +BuildRequires: bzip2-devel +BuildRequires: chrpath +BuildRequires: gettext +BuildRequires: glib2-devel +BuildRequires: gobject-introspection-devel +BuildRequires: intltool +BuildRequires: libxml2-devel + Obsoletes: libgsf-gnome < 1.14.22 Obsoletes: libgsf-python < 1.14.26 @@ -34,33 +39,36 @@ libgsf. %patch0 -p1 -b .aarch64 %build -%configure --disable-gtk-doc --disable-static -sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool -sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool -make %{?_smp_mflags} +%configure --disable-gtk-doc --disable-static --enable-introspection=yes + +make %{?_smp_mflags} V=1 %install -rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -make DESTDIR=$RPM_BUILD_ROOT install -%find_lang libgsf -rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +make DESTDIR=%{buildroot} install + +%find_lang %{name} + +# Remove lib rpaths +chrpath --delete %{buildroot}%{_bindir}/gsf* + +# Remove .la files +find %{buildroot} -name '*.la' -exec rm -f {} ';' %post -p /sbin/ldconfig %postun -p /sbin/ldconfig %files -f libgsf.lang -%defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB README %{_libdir}/libgsf-1.so.* +%{_libdir}/girepository-1.0/Gsf-1.typelib %{_bindir}/gsf-office-thumbnailer %{_mandir}/man1/gsf-office-thumbnailer.1.gz %dir %{_datadir}/thumbnailers %{_datadir}/thumbnailers/gsf-office.thumbnailer %files devel -%defattr(-,root,root,-) %{_bindir}/gsf %{_bindir}/gsf-vba-dump %{_libdir}/libgsf-1.so @@ -68,13 +76,17 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %dir %{_includedir}/libgsf-1 %{_includedir}/libgsf-1/gsf %{_datadir}/gtk-doc/html/gsf +%{_datadir}/gir-1.0/Gsf-1.gir %{_mandir}/man1/gsf.1.gz %{_mandir}/man1/gsf-vba-dump.1.gz -%clean -rm -rf $RPM_BUILD_ROOT - %changelog +* Tue Aug 27 2013 Peter Robinson 1.14.28-1 +- Update to 1.14.28 +- Enable gobject introspection +- Cleanup and modernise spec +- Drop old dependencies + * Thu Jul 25 2013 Caolán McNamara 1.14.27-1 - latest version diff --git a/sources b/sources index b175c1e..426a89e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -12f3693e8ad783a8b78b240cf54e33d9 libgsf-1.14.27.tar.xz +48cc1409951419c5e2be1a16f749adb2 libgsf-1.14.28.tar.xz