rpms/zope/FC-6 zope.configure-2.9.5.patch, 1.1, 1.2 zope.spec, 1.27, 1.28

[Jonathan Steffan (jsteffan)]

Author: jsteffan

Update of /cvs/extras/rpms/zope/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9874

Modified Files:
	zope.configure-2.9.5.patch zope.spec 
Log Message:
Added patch to enable support for python 2.4.4


zope.configure-2.9.5.patch:

Index: zope.configure-2.9.5.patch
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.configure-2.9.5.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- zope.configure-2.9.5.patch	22 Nov 2006 19:57:32 -0000	1.1
+++ zope.configure-2.9.5.patch	22 Nov 2006 21:55:01 -0000	1.2
@@ -1,19 +1,11 @@
-*** configure   2006-11-22 12:54:48.000000000 -0700
---- configure.orig      2006-11-22 12:52:19.000000000 -0700
-*************** TARGET="2.4.3"
-*** 18,24 ****
-  # sys.version) below in "best" to "worst" order, not including the
-  # target version.  Up to six acceptable python versions are allowed.
-  # Do not include the target version number in this list!
-! ACCEPTABLE="2.4.2 2.4.4"
-  
-  # provide the executable names for all the acceptable versions
-  # (and the target version) below
---- 18,24 ----
-  # sys.version) below in "best" to "worst" order, not including the
-  # target version.  Up to six acceptable python versions are allowed.
-  # Do not include the target version number in this list!
-! ACCEPTABLE="2.4.2"
-  
-  # provide the executable names for all the acceptable versions
-  # (and the target version) below
+--- Zope-2.9.5-final.orig/configure     2006-10-02 09:53:36.000000000 -0600
++++ Zope-2.9.5-final/configure  2006-11-22 14:28:48.000000000 -0700
+@@ -18,7 +18,7 @@
+ # sys.version) below in "best" to "worst" order, not including the
+ # target version.  Up to six acceptable python versions are allowed.
+ # Do not include the target version number in this list!
+-ACCEPTABLE="2.4.2"
++ACCEPTABLE="2.4.2 2.4.4"
+ 
+ # provide the executable names for all the acceptable versions
+ # (and the target version) below


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- zope.spec	22 Nov 2006 18:22:32 -0000	1.27
+++ zope.spec	22 Nov 2006 21:55:01 -0000	1.28
@@ -27,6 +27,7 @@
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
 Patch0:  zope-2.7.3-config.patch
+Patch1:  zope.configure-2.9.5.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -47,6 +48,7 @@
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
+%patch1 -p1
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config