From a712f9e5a7891c63ff0f77de1ea9050d3b770845 Mon Sep 17 00:00:00 2001
From: Luke Macken <lmacken@redhat.com>
Date: Aug 27 2014 21:44:32 +0000
Subject: Update the tutorial-doc patch


---

diff --git a/python-cherrypy-tutorial-doc.patch b/python-cherrypy-tutorial-doc.patch
index cc37c2e..2b189bb 100644
--- a/python-cherrypy-tutorial-doc.patch
+++ b/python-cherrypy-tutorial-doc.patch
@@ -1,24 +1,22 @@
-Index: CherryPy-3.2.1/setup.py
-===================================================================
---- CherryPy-3.2.1.orig/setup.py
-+++ CherryPy-3.2.1/setup.py
-@@ -59,7 +59,6 @@ url="http://www.cherrypy.org"
- cp_license="BSD"
- packages=[
+--- CherryPy-3.5.0.orig/setup.py	2014-08-27 15:34:43.973310337 -0600
++++ CherryPy-3.5.0/setup.py	2014-08-27 15:35:18.131503260 -0600
+@@ -74,7 +74,6 @@
+ cp_license = "BSD"
+ packages = [
      "cherrypy", "cherrypy.lib",
 -    "cherrypy.tutorial", "cherrypy.test",
      "cherrypy.process",
      "cherrypy.scaffold",
      "cherrypy.wsgiserver",
-@@ -76,19 +75,6 @@ data_files=[
+@@ -90,19 +89,6 @@
                             ]),
-     ('cherrypy/scaffold/static', ['cherrypy/scaffold/static/made_with_cherrypy_small.png',
-                                   ]),
+     ('cherrypy/scaffold/static', [
+         'cherrypy/scaffold/static/made_with_cherrypy_small.png']),
 -    ('cherrypy/test', ['cherrypy/test/style.css',
 -                       'cherrypy/test/test.pem',
 -                       ]),
 -    ('cherrypy/test/static', ['cherrypy/test/static/index.html',
--                              'cherrypy/test/static/dirback.jpg',]),
+-                              'cherrypy/test/static/dirback.jpg', ]),
 -    ('cherrypy/tutorial',
 -        [
 -            'cherrypy/tutorial/tutorial.conf',
@@ -26,7 +24,7 @@ Index: CherryPy-3.2.1/setup.py
 -            'cherrypy/tutorial/pdf_file.pdf',
 -            'cherrypy/tutorial/custom_error.html',
 -        ]
--    ),
+-     ),
  ]
  scripts = ["cherrypy/cherryd"]
  
diff --git a/python-cherrypy.spec b/python-cherrypy.spec
index f4dcb9c..e5edba0 100644
--- a/python-cherrypy.spec
+++ b/python-cherrypy.spec
@@ -13,7 +13,6 @@ Source0:        http://download.cherrypy.org/cherrypy/%{version}/CherryPy-%{vers
 # Don't ship the tests or tutorials in the python module directroy,
 # tutorial will be shipped as doc instead
 Patch0:         python-cherrypy-tutorial-doc.patch
-Patch1: cherrypy-unittest.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -31,7 +30,6 @@ results in smaller source code developed in less time.
 %prep
 %setup -q -n CherryPy-%{version}
 %patch0 -p1
-%patch1 -p1
 
 %{__sed} -i 's/\r//' README.txt cherrypy/tutorial/README.txt cherrypy/tutorial/tutorial.conf