rpms/libgsf/devel libgsf.spec,1.50,1.51

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/libgsf/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3879

Modified Files:
	libgsf.spec 
Log Message:
Resolves: rhbz#426436 fix up python x86_64 import gsf


Index: libgsf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgsf/devel/libgsf.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- libgsf.spec	14 Sep 2007 05:39:01 -0000	1.50
+++ libgsf.spec	21 Dec 2007 09:10:59 -0000	1.51
@@ -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 @@
 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 @@
 
 %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 at redhat.com> 1.14.7-2
+- Resolves: rhbz#426436 fix up python x86_64 import gsf
+
 * Fri Sep 14 2007 Matthias Clasen <mclasen at redhat.com> 1.14.7-1
 - Update to 1.14.7