From ae48007ee35e0357ab16fa90a4f04f79edbe8767 Mon Sep 17 00:00:00 2001
From: Jonathan Steffan <jsteffan@fedoraproject.org>
Date: Wed, 22 Nov 2006 18:22:32 +0000
Subject: [PATCH] Updated to 2.9.5

---
 .cvsignore                     |  2 +-
 sources                        |  2 +-
 zope-2.8.3-pythonwarning.patch | 13 -------------
 zope.spec                      | 19 ++++++-------------
 4 files changed, 8 insertions(+), 28 deletions(-)
 delete mode 100644 zope-2.8.3-pythonwarning.patch

diff --git a/.cvsignore b/.cvsignore
index 7b0b3ec..7a648a7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Zope-2.9.4-final.tgz
+Zope-2.9.5-final.tgz
diff --git a/sources b/sources
index 5d42a7d..4b963c3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz
+17cd06a6974dbdd0e4982a343b79fb00  Zope-2.9.5-final.tgz
diff --git a/zope-2.8.3-pythonwarning.patch b/zope-2.8.3-pythonwarning.patch
deleted file mode 100644
index 4cb8e0d..0000000
--- a/zope-2.8.3-pythonwarning.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./lib/python/App/dtml/zope_quick_start.dtml.pythonwarning	2005-10-25 15:23:22.000000000 +0200
-+++ ./lib/python/App/dtml/zope_quick_start.dtml	2005-10-25 15:35:55.000000000 +0200
-@@ -134,5 +134,10 @@
- 
- </ul>
- 
-+<p style="color: red; font-weight: bold">
-+WARNING: you are running Zope 2.8.X with python 2.4.X, this is not a supported
-+combination. Don't file bugreports or ask for support on zope.org.
-+</p>
-+
- </body>
- </html>
diff --git a/zope.spec b/zope.spec
index 07e9f74..772fcef 100644
--- a/zope.spec
+++ b/zope.spec
@@ -12,13 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.4
-Release: 3%{?dist}
+Version: 2.9.5
+Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -28,7 +27,6 @@ Source4: zope-README.Fedora
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
-Patch1:  zope-2.8.3-pythonwarning.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -46,18 +44,11 @@ systems.
 After starting Zope, you can access it by pointing your browser to
 http://localhost:8080
 
-WARNING: this zope package has been built on python 2.4.X, which is not
-supported ! Do not file bugreports or ask for support on zope.org if you
-choose to use this package.
-
-
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
-# Warning on the default index_html about python 2.4 & zope 2.8
-#%patch1 -p1 -b .pythonwarning
 
 chmod -x skel/import/README.txt
 install -pm 644 %{SOURCE4} README.Fedora
@@ -188,8 +179,10 @@ fi
 %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc
 
 
-
 %changelog
+* Tue Nov 22 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.5-1
+- Updated to 2.9.5 and removed not needed patches
+
 * Tue Nov 21 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.4-3
 - Removed Five from zope package (plone 2.5.1 now provides the needed
   version.)