From 2b2350daa6fb1cc447eb2fb042bd5e91261a7a82 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: Fri, 21 Dec 2007 09:10:59 +0000
Subject: [PATCH] Resolves: rhbz#426436 fix up python x86_64 import gsf

---
 libgsf.spec | 21 +++++++--------------
 1 file changed, 7 insertions(+), 14 deletions(-)

diff --git a/libgsf.spec b/libgsf.spec
index a04c551..dab3b0c 100644
--- a/libgsf.spec
+++ b/libgsf.spec
@@ -4,7 +4,7 @@
 Summary: GNOME Structured File library
 Name: libgsf
 Version: 1.14.7
-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
@@ -70,15 +70,8 @@ make DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
 rm -f $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf/*.la
 
-#%pre
-#if [ "$1" -gt 1 ]; then
-#    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-#    gconftool-2 --makefile-uninstall-rule \
-#      %{_sysconfdir}/gconf/schemas/gsf-office-thumbnailer.schemas >/dev/null
-#    # If the schema file has ever been renamed::
-#    #gconftool-2 --makefile-uninstall-rule \
-#    #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null
-#fi
+mv $RPM_BUILD_ROOT/%{python_py_sitearch}/gsf/* $RPM_BUILD_ROOT/%{python_lib_sitearch}/gsf
+rm -r $RPM_BUILD_ROOT/%{python_py_sitearch}/gsf
 
 %post
 /sbin/ldconfig
@@ -132,15 +125,15 @@ fi
 
 %files python
 %defattr(-,root,root,-)
-%dir %{python_py_sitearch}/gsf
-%{python_py_sitearch}/gsf/__init__.*
-%dir %{python_lib_sitearch}/gsf
-%{python_lib_sitearch}/gsf/*.so
+%{python_lib_sitearch}/gsf/
 
 %clean
 rm -r $RPM_BUILD_ROOT
 
 %changelog
+* Fri Dec 21 2007 Caolan McNamara <caolanm@redhat.com> 1.14.7-2
+- Resolves: rhbz#426436 fix up python x86_64 import gsf
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen@redhat.com> 1.14.7-1
 - Update to 1.14.7