rpms/plone/FC-5 plone.spec, 1.20, 1.21 Plone-2.5-atxmlperms.patch, 1.1, NONE

[Jonathan Steffan (jsteffan)]

Author: jsteffan

Update of /cvs/extras/rpms/plone/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10777

Modified Files:
	plone.spec 
Removed Files:
	Plone-2.5-atxmlperms.patch 
Log Message:
Updated so plone now provides Five



Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-5/plone.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- plone.spec	4 Nov 2006 09:14:18 -0000	1.20
+++ plone.spec	28 Nov 2006 06:08:22 -0000	1.21
@@ -6,15 +6,13 @@
 
 Name:           plone
 Version:        2.5.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        User friendly and powerful open source Content Management System
 License:        GPL
 Group:          System Environment/Daemons
 URL:            http://www.plone.org/
 Source0:        http://dl.sf.net/plone/Plone-%{version}-final.tar.gz
-#Source1:        http://plone.org/products/passwordresettool/releases/0.4.1/PasswordResetTool-0.4.1.tar.gz
 Source10:       http://plone.org/products/plone-hotfix/releases/20061031/PloneHotFix20061031.tar.gz
-#Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -45,18 +43,13 @@
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
 #rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
 
-# Included in Zope 2.9
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
+# Plone now provides Five
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/Five
 
 # Avoid conflicts, put those in %%doc
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/README.txt
 rm -f $RPM_BUILD_ROOT%{software_home}/Products/CONTENTS.txt
 
-# Fixed version of PasswordResetTool
-#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/PasswordResetTool
-#tar -xzpf %{SOURCE1} -C $RPM_BUILD_ROOT%{software_home}/Products/
-
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -73,6 +66,9 @@
 
 
 %changelog
+* Mon Nov 27 2006 Jonathan Steffan <jon a fedoraunity.org> 2.5.1-4
+- Updated so plone now provides the correct version of the Five product
+
 * Sat Nov 04 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5.1-3
 - add Plone Hotfix 20061031 (bug 213983)
 


--- Plone-2.5-atxmlperms.patch DELETED ---