[python-daemon/el5/master] Revert "Remove the setuptools dependency on lockfile, since the EL5 package does not"

[Luke Macken]

commit f91ee628bff5153dafe95130c509d774d51f6af5
Author: Luke Macken <lmacken at redhat.com>
Date:   Thu Dec 16 01:01:22 2010 -0500

    Revert "Remove the setuptools dependency on lockfile, since the EL5 package does not"
    
    We're going to solve this problem with python-lockfile itself.
    
    This reverts commit c93810f3d5c48a633f8a6c140336df70676aad3f.

 python-daemon-1.5.2-lockfile.patch |   12 ------------
 python-daemon.spec                 |    8 +-------
 2 files changed, 1 insertions(+), 19 deletions(-)
---
diff --git a/python-daemon.spec b/python-daemon.spec
index 99682ff..cf882da 100644
--- a/python-daemon.spec
+++ b/python-daemon.spec
@@ -3,7 +3,7 @@
 
 Name:           python-daemon
 Version:        1.5.2
-Release:        4%{?dist}
+Release:        3%{?dist}
 Summary:        Library to implement a well-behaved Unix daemon process
 
 Group:          Development/Languages
@@ -12,7 +12,6 @@ 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
 Patch1:         %{name}-%{version}-py24-exc.patch
-Patch2:         %{name}-%{version}-lockfile.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -28,7 +27,6 @@ This library implements the well-behaved daemon specification of PEP 3143,
 %setup -q
 %patch0 -p0 -b .import
 %patch1 -p0 -b .py24-exc
-%patch2 -b .lockfile
 
 sed -i -e '/^#!\//, 1d' daemon/version/version_info.py
 
@@ -56,10 +54,6 @@ PYTHONPATH=$(pwd) nosetests
 %{python_sitelib}/python_daemon-%{version}-py%{pyver}.egg-info/
 
 %changelog
-* Thu Dec 16 2010 Luke Macken <lmacken at redhat.com> - 1.5.2-4
-- Remove the setuptools dependency on lockfile, since the EL5 package does not
-  contain the proper egg-info metadata
-
 * Fri Jan 08 2010 Luke Macken <lmacken at redhat.com> - 1.5.2-3
 - Add python-daemon-1.5.2-py24-exc.patch to fix a few
   unit tests on python 2.4