[python-cement] Adding patch2 (path fixes)

[derks]

commit 59911a6b9816c85ca4a82cc702fe1993ebab2e75
Author: BJ Dierkes <wdierkes at rackspace.com>
Date:   Tue Jul 12 18:29:27 2011 -0500

    Adding patch2 (path fixes)

 cement-0.8.18-paths.patch      |   33 ++++++++++++++++++++++++++++
 cement-0.8.18-setuptools.patch |   47 ++++++++++++++++++++++++++++++++++++++++
 cement-tests.patch             |   18 ---------------
 python-cement.spec             |   12 ++++++++-
 4 files changed, 90 insertions(+), 20 deletions(-)
---
diff --git a/cement-0.8.18-paths.patch b/cement-0.8.18-paths.patch
new file mode 100644
index 0000000..5aa4bcc
--- /dev/null
+++ b/cement-0.8.18-paths.patch
@@ -0,0 +1,33 @@
+--- cement-0.8.18/src/cement.test/tests/00_tests_start.py.orig	2011-07-06 19:18:11.000000000 -0500
++++ cement-0.8.18/src/cement.test/tests/00_tests_start.py	2011-07-12 18:24:00.000000000 -0500
+@@ -1,5 +1,8 @@
+ 
+-import sys
++import site
++
++site.addsitedir('.')
++site.addsitedir('../../cement')
+ 
+ from tempfile import mkdtemp
+ from nose.tools import raises, with_setup
+@@ -7,7 +10,6 @@
+ from cement_test.core.config import get_nose_config        
+ from cement_test.core.appmain import nose_main
+ 
+-sys.path.insert(0, '.')
+ # use an altername config for testing
+ config = get_nose_config(mkdtemp())
+ 
+--- cement-0.8.18/doc/source/conf.py.orig	2011-07-06 19:18:11.000000000 -0500
++++ cement-0.8.18/doc/source/conf.py	2011-07-12 18:24:44.000000000 -0500
+@@ -12,6 +12,10 @@
+ # serve to show the default.
+ 
+ import sys, os
++import site
++
++site.addsitedir('../../src/cement')
++
+ from pkg_resources import get_distribution
+ 
+ VERSION = '0.8'
diff --git a/cement-0.8.18-setuptools.patch b/cement-0.8.18-setuptools.patch
new file mode 100644
index 0000000..9c70811
--- /dev/null
+++ b/cement-0.8.18-setuptools.patch
@@ -0,0 +1,47 @@
+This patch removes all the 'install_requires' so that setuptools doesn't try
+to install them (from the internets) during koji build.
+
+--- cement-0.8.18/src/cement/setup.py.orig	2011-07-06 19:18:11.000000000 -0500
++++ cement-0.8.18/src/cement/setup.py	2011-07-12 17:25:52.000000000 -0500
+@@ -59,11 +59,6 @@
+     include_package_data=True,
+     zip_safe=False,
+     install_requires=[
+-        "ConfigObj",
+-        "jsonpickle",
+-        "Genshi",
+-        ### Required for documentation
+-        # "Sphinx >=1.0",
+         ],
+     setup_requires=[
+         ],
+--- cement-0.8.18/src/cement.devtools/setup.py.orig	2011-07-06 19:18:11.000000000 -0500
++++ cement-0.8.18/src/cement.devtools/setup.py	2011-07-12 17:26:07.000000000 -0500
+@@ -67,9 +67,6 @@
+     include_package_data=True,
+     zip_safe=False,
+     install_requires=[
+-        "PasteScript", 
+-        "tempita",
+-        "cement == %s" % VERSION,
+         ],
+     setup_requires=[
+         ],
+--- cement-0.8.18/src/cement.test/setup.py.orig	2011-07-06 19:18:11.000000000 -0500
++++ cement-0.8.18/src/cement.test/setup.py	2011-07-12 17:27:34.000000000 -0500
+@@ -55,15 +55,8 @@
+     include_package_data=True,
+     zip_safe=False,
+     install_requires=[
+-        "ConfigObj",
+-        "Genshi",
+-        "cement >=0.8.9, <0.9",
+-        "jsonpickle",
+         ],
+     setup_requires=[
+-        ### Required for nose testing + coverage
+-        "nose",
+-        "coverage",
+         ],
+     test_suite='nose.collector',
+     entry_points="""
diff --git a/python-cement.spec b/python-cement.spec
index 9311832..41a9a0c 100644
--- a/python-cement.spec
+++ b/python-cement.spec
@@ -62,7 +62,9 @@ Requires: python-simplejson
 BuildRequires: python-nose, python-coverage
 %endif
 
-Patch0: cement-tests.patch
+#Patch0: cement-0.8.18-testing.patch
+Patch1: cement-0.8.18-setuptools.patch
+Patch2: cement-0.8.18-paths.patch
 
 %description
 Cement is an advanced CLI Application Framework for Python. It promotes code
@@ -108,7 +110,9 @@ Framework for Python.
 
 %prep
 %setup -q -n cement-%{version}
-%patch0 -p1 -b .tests
+#%%patch0 -p1 -b .testing
+%patch1 -p1 -b .setuptools
+%patch2 -p1 -b .paths
 
 mv src/cement/LICENSE.psf .
 cp -a %SOURCE1 src/cement.test/test_runner.py
@@ -159,6 +163,7 @@ popd
 %if 0%{?_with_tests}
 pushd src/cement.test
 %{__python} setup.py nosetests 
+#%%{__python} ./test_runner.py
 popd
 %endif
 
@@ -192,6 +197,9 @@ rm -rf %{buildroot}
 - Latest sources from upstream.  Full changelog available at:
   http://builtoncement.org/cement/0.8/doc/changes.html
 - BuildRequire: python-coverage for tests
+- Added Patch1: cement-0.8.18-setuptools.patch
+- Removed Patch0 (testing)
+- Added Patch2 (paths)
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild