rpms/zope/FC-6 .cvsignore, 1.14, 1.15 sources, 1.14, 1.15 zope.spec, 1.28, 1.29

[Jonathan Steffan (jsteffan)]

Author: jsteffan

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

Modified Files:
	.cvsignore sources zope.spec 
Log Message:
updated to 2.9.6 and added Five back to zope



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	22 Nov 2006 18:22:32 -0000	1.14
+++ .cvsignore	6 Jan 2007 06:44:22 -0000	1.15
@@ -1 +1 @@
-Zope-2.9.5-final.tgz
+Zope-2.9.6-final.tgz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	22 Nov 2006 18:22:32 -0000	1.14
+++ sources	6 Jan 2007 06:44:22 -0000	1.15
@@ -1 +1 @@
-17cd06a6974dbdd0e4982a343b79fb00  Zope-2.9.5-final.tgz
+a87008a9e78248072ea5908e1006b269  Zope-2.9.6-final.tgz


Index: zope.spec
===================================================================
RCS file: /cvs/extras/rpms/zope/FC-6/zope.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- zope.spec	22 Nov 2006 21:55:01 -0000	1.28
+++ zope.spec	6 Jan 2007 06:44:22 -0000	1.29
@@ -12,12 +12,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.5
+Version: 2.9.6
 Release: 1%{?dist}
 License: ZPL
 Group: 	 System Environment/Daemons
 URL:     http://www.zope.org/
-Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz
+Source0: http://www.zope.org/Products/Zope/2.9.6/Zope-2.9.6-final.tgz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -27,7 +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
+#Patch1:  zope.configure-2.9.5.patch
 
 BuildRequires: python-devel >= %{python_minver} 
 BuildRequires: python >= %{python_minver} 
@@ -48,7 +48,7 @@
 %prep
 %setup -q -n Zope-%{version}-final
 %patch0 -p2 -b .config
-%patch1 -p1
+#%patch1 -p1
 # remove the backup, or we'll install it too...
 rm -f skel/etc/zope.conf.in.config
 
@@ -113,9 +113,6 @@
 # included in %%doc
 rm -rf $RPM_BUILD_ROOT%{zope_home}/doc
 
-#now included with plone 2.5.1 version 1.3.7
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
-
 # write version.txt
 echo "Zope %{version}-%{release}" > \
     "$RPM_BUILD_ROOT%{software_home}/version.txt"
@@ -182,6 +179,9 @@
 
 
 %changelog
+* Fri Jan 5 2007 Jonathan Steffan <jon a fedoraunity.org> 2.9.6-1
+- Updated to 2.9.6 added Five back into Zope (#221252)
+
 * Tue Nov 22 2006 Jonathan Steffan <jon a fedoraunity.org> 2.9.5-1
 - Updated to 2.9.5 and removed not needed patches