rpms/nautilus-python/F-12 fix-libpython-lib64-location.patch, NONE, 1.1 nautilus-python.spec, 1.9, 1.10

[dignan]

Author: dignan

Update of /cvs/pkgs/rpms/nautilus-python/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24065

Modified Files:
	nautilus-python.spec 
Added Files:
	fix-libpython-lib64-location.patch 
Log Message:
Fixes 64-bit location error

fix-libpython-lib64-location.patch:
 Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE fix-libpython-lib64-location.patch ---
diff -Naurb nautilus-python-0.5.1.orig/src/Makefile.am nautilus-python-0.5.1/src/Makefile.am
--- nautilus-python-0.5.1.orig/src/Makefile.am	2008-09-16 14:59:48.000000000 -0400
+++ nautilus-python-0.5.1/src/Makefile.am	2010-01-28 20:44:46.278892517 -0500
@@ -7,7 +7,7 @@
 	$(DISABLE_DEPRECATED_CFLAGS)			\
 	$(NAUTILUS_PYTHON_CFLAGS)			\
 	-DPYTHON_VERSION=\"$(PYTHON_VERSION)\"		\
-	-DPY_LIB_LOC="\"$(PYTHON_LIB_LOC)\""		\
+	-DPY_LIB_LOC="\"$(libdir)\""		\
 	$(PYTHON_INCLUDES)
 
 nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)


Index: nautilus-python.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-python/F-12/nautilus-python.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nautilus-python.spec	25 Jul 2009 15:47:40 -0000	1.9
+++ nautilus-python.spec	29 Jan 2010 02:23:42 -0000	1.10
@@ -1,13 +1,20 @@
 Name:           nautilus-python
 Version:        0.5.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Python bindings for Nautilus
 
 Group:          Development/Libraries
 License:        GPLv2+
 URL:            http://www.gnome.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
+
+# Fixes problem with macros not defined by Fedora autotools
 Patch0:         %{name}-%{version}-gnome-vfs.patch
+
+# Fixes error with location libpython.so on 64-bit systems
+# upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=608405
+Patch1:         fix-libpython-lib64-location.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  autoconf
@@ -38,6 +45,7 @@ Python bindings for Nautilus
 %prep
 %setup -q
 %patch0 -p1 -b .gnome-vfs
+%patch1 -p1 
 autoreconf -ivf
 %{__rm} -rf autom4te.cache
 
@@ -77,6 +85,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 28 2010 Patrick Dignan <dignan.patrick at, gmail.com>
+- Fixed error with location of libpython
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.5.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild