rpms/python-daemon/EL-5 python-daemon-1.5.2-import.patch, NONE, 1.1 python-daemon.spec, 1.4, 1.5

[Luke Macken]

Author: lmacken

Update of /cvs/pkgs/rpms/python-daemon/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27474

Modified Files:
	python-daemon.spec 
Added Files:
	python-daemon-1.5.2-import.patch 
Log Message:
* Fri Jan 08 2010 Luke Macken <lmacken at redhat.com> - 1.5.2-2
- Add python-daemon-1.5.2-import.patch, which fixes the use of
  __import__ to work on Python 2.4



python-daemon-1.5.2-import.patch:
 setup.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE python-daemon-1.5.2-import.patch ---
--- setup.py.orig	2010-01-08 20:29:20.000000000 -0500
+++ setup.py	2010-01-08 20:31:00.000000000 -0500
@@ -19,7 +19,7 @@
 
 distribution_name = "python-daemon"
 main_module_name = 'daemon'
-main_module = __import__(main_module_name, fromlist=['version'])
+main_module = __import__(main_module_name, globals(), {}, ['version'])
 version = main_module.version
 
 short_description, long_description = (


Index: python-daemon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-daemon/EL-5/python-daemon.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- python-daemon.spec	9 Jan 2010 00:00:19 -0000	1.4
+++ python-daemon.spec	9 Jan 2010 05:54:42 -0000	1.5
@@ -3,13 +3,14 @@
 
 Name:           python-daemon
 Version:        1.5.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Library to implement a well-behaved Unix daemon process
 
 Group:          Development/Languages
 License:        Python
 URL:            http://pypi.python.org/pypi/python-daemon/
 Source0:        http://pypi.python.org/packages/source/p/python-daemon/%{name}-%{version}.tar.gz
+Patch0:         %{name}-%{version}-import.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -23,6 +24,7 @@ This library implements the well-behaved
 
 %prep
 %setup -q
+%patch0 -p0 -b .import
 
 sed -i -e '/^#!\//, 1d' daemon/version/version_info.py
 
@@ -50,6 +52,10 @@ PYTHONPATH=$(pwd) nosetests
 %{python_sitelib}/python_daemon-%{version}-py%{pyver}.egg-info/
 
 %changelog
+* Fri Jan 08 2010 Luke Macken <lmacken at redhat.com> - 1.5.2-2
+- Add python-daemon-1.5.2-import.patch, which fixes the use of
+  __import__ to work on Python 2.4
+
 * Wed Dec 23 2009 Thomas Spura <tomspur at fedoraproject.org> - 1.5.2-1
 - add missing BR: python-nose
 - also add lockfile as R (bug #513546)