From d26d4b674dbac6aecc3476388ace2132a68ba8b1 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Jul 19 2010 12:09:05 +0000 Subject: Resolves: rhbz#226023 merge review comments --- diff --git a/libgsf.spec b/libgsf.spec index dd1c02c..89e8eaa 100644 --- a/libgsf.spec +++ b/libgsf.spec @@ -1,10 +1,14 @@ -%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)") -%define python_lib_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") +%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5) +%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from +distutils.sysconfig import get_python_lib; print(get_python_lib())")} +%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from +distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%endif Summary: GNOME Structured File library Name: libgsf Version: 1.14.18 -Release: 2%{?dist} +Release: 3%{?dist} Group: System Environment/Libraries License: LGPLv2 Source: ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.14/%{name}-%{version}.tar.bz2 @@ -18,7 +22,7 @@ Requires(post): GConf2 Requires(preun): GConf2 %description -A library for reading and writing structured files (eg MS OLE and Zip) +A library for reading and writing structured files (e.g. MS OLE and Zip) %package gnome Summary: GNOME integration bits for libgsf @@ -61,6 +65,8 @@ Python bindings for libgsf %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} %install @@ -69,11 +75,11 @@ export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 make DESTDIR=$RPM_BUILD_ROOT install %find_lang libgsf rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la -rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.la +rm -f $RPM_BUILD_ROOT/%{python_sitearch}/gsf/*.la -if [ "%{python_py_sitearch}" != "%{python_lib_sitearch}" ]; then - mv $RPM_BUILD_ROOT/%{python_py_sitearch}/gsf/* $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf - rm -r $RPM_BUILD_ROOT/%{python_py_sitearch}/gsf +if [ "%{python_sitelib}" != "%{python_sitearch}" ]; then + mv $RPM_BUILD_ROOT/%{python_sitelib}/gsf/* $RPM_BUILD_ROOT/%{python_sitearch}/gsf + rm -r $RPM_BUILD_ROOT/%{python_sitelib}/gsf fi %post -p /sbin/ldconfig @@ -127,12 +133,15 @@ fi %files python %defattr(-,root,root,-) -%{python_lib_sitearch}/gsf/ +%{python_sitearch}/gsf/ %clean -rm -r $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 19 2010 Caolán McNamara 1.14.18-3 +- Resolves: rhbz#226023 merge review comments + * Sun Jun 13 2010 Caolán McNamara 1.14.18-2 - include COPYING.LIB @@ -193,49 +202,49 @@ rm -r $RPM_BUILD_ROOT - 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 +* Thu Mar 06 2008 Caolán McNamara 1.14.8-1 - latest version * Mon Feb 18 2008 Fedora Release Engineering - 1.14.7-3 - Autorebuild for GCC 4.3 -* Fri Dec 21 2007 Caolan McNamara 1.14.7-2 +* Fri Dec 21 2007 Caolán McNamara 1.14.7-2 - Resolves: rhbz#426436 fix up python x86_64 import gsf * Fri Sep 14 2007 Matthias Clasen 1.14.7-1 - Update to 1.14.7 -* Wed Sep 05 2007 Caolan McNamara 1.14.6-1 +* Wed Sep 05 2007 Caolán McNamara 1.14.6-1 - next version -* Wed Aug 29 2007 Caolan McNamara 1.14.5-3 +* Wed Aug 29 2007 Caolán McNamara 1.14.5-3 - rebuild -* Thu Aug 02 2007 Caolan McNamara 1.14.5-2 +* Thu Aug 02 2007 Caolán McNamara 1.14.5-2 - clarify license: LGPL v2.1 in source headers, no "later" -* Thu Jul 12 2007 Caolan McNamara 1.14.5-1 +* Thu Jul 12 2007 Caolán McNamara 1.14.5-1 - next version -* Mon Jun 18 2007 Caolan McNamara 1.14.4-1 +* Mon Jun 18 2007 Caolán McNamara 1.14.4-1 - next version -* Sun Mar 25 2007 Caolan McNamara 1.14.3-4 +* Sun Mar 25 2007 Caolán McNamara 1.14.3-4 - Resolves rhbz#233862 unowned directory fix from Michael Schwendt -* Fri Feb 09 2007 Caolan McNamara 1.14.3-3 +* Fri Feb 09 2007 Caolán McNamara 1.14.3-3 - some spec cleanups * Thu Dec 7 2006 Jeremy Katz - 1.14.3-2 - rebuild for python 2.5 -* Thu Nov 09 2006 Caolan McNamara 1.14.3-1 +* Thu Nov 09 2006 Caolán McNamara 1.14.3-1 - bump to 1.14.3 * Wed Nov 1 2006 Dan Williams - 1.14.2-2 - Split to remove gnome-vfs2 dependency on core sub-packages -* Mon Oct 09 2006 Caolan McNamara - 1.14.2-1 +* Mon Oct 09 2006 Caolán McNamara - 1.14.2-1 - bump to 1.14.2 * Fri Jul 14 2006 Bill Nottingham - 1.14.1-6 @@ -245,16 +254,16 @@ rm -r $RPM_BUILD_ROOT - rebuild - add missing br gettext -* Mon May 29 2006 Caolan McNamara 1.14.1-4 +* Mon May 29 2006 Caolán McNamara 1.14.1-4 - rh#193417# Add BuildRequires perl-XML-Parser -* Tue May 23 2006 Caolan McNamara 1.14.1-3 +* Tue May 23 2006 Caolán McNamara 1.14.1-3 - rh#192707# disable rebuilding of gtk-doc so as to allow multi-arch devel * Wed May 10 2006 Matthias Clasen 1.14.1-2 - Update to 1.14.1 -* Mon Mar 20 2006 Caolan McNamara 1.14.0-1 +* Mon Mar 20 2006 Caolán McNamara 1.14.0-1 - next version * Fri Feb 10 2006 Jesse Keating - 1.13.3-2.2.1 @@ -266,36 +275,36 @@ rm -r $RPM_BUILD_ROOT * Fri Dec 09 2005 Jesse Keating - rebuilt -* Mon Dec 5 2005 Caolan McNamara 1.13.3-2 +* Mon Dec 5 2005 Caolán McNamara 1.13.3-2 - rh#172062# Obsolete extras libgsf113 * Fri Dec 2 2005 Matthias Clasen 1.13.3-1 - Update to 1.13.3 -* Tue Sep 20 2005 Caolan McNamara 1.12.3-1 +* Tue Sep 20 2005 Caolán McNamara 1.12.3-1 - bump to next version - add manpage for gsf-office-thumbnailer -* Fri Aug 26 2005 Caolan McNamara 1.12.2-1 +* Fri Aug 26 2005 Caolán McNamara 1.12.2-1 - bump to latest version -* Wed Jun 15 2005 Caolan McNamara 1.12.1-1 +* Wed Jun 15 2005 Caolán McNamara 1.12.1-1 - bump to latest version -* Wed Mar 2 2005 Caolan McNamara 1.12.0-1 +* Wed Mar 2 2005 Caolán McNamara 1.12.0-1 - bump to latest version - clean spec -* Wed Mar 2 2005 Caolan McNamara 1.11.1-2 +* Wed Mar 2 2005 Caolán McNamara 1.11.1-2 - rebuild with gcc4 -* Thu Dec 16 2004 Caolan McNamara 1.11.1-1 +* Thu Dec 16 2004 Caolán McNamara 1.11.1-1 - upgrade to 1.11.1 -* Tue Aug 31 2004 Caolan McNamara 1.10.1-1 +* Tue Aug 31 2004 Caolán McNamara 1.10.1-1 - upgrade to 1.10.1 -* Wed Aug 18 2004 Caolan McNamara 1.10.0-1 +* Wed Aug 18 2004 Caolán McNamara 1.10.0-1 - upgrade to 1.10.0 * Tue Jun 15 2004 Elliot Lee @@ -306,7 +315,7 @@ rm -r $RPM_BUILD_ROOT - Added smp_mflags - Fixed double included .so files -* Wed May 5 2004 Caolan McNamara 1.9.0-1 +* Wed May 5 2004 Caolán McNamara 1.9.0-1 * upgrade to 1.9.0 to get crash fixes * Sun Apr 11 2004 Warren Togami 1.8.2-3