rpms/plone/devel Plone-2.5-atxmlperms.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 plone.spec, 1.13, 1.14 sources, 1.9, 1.10

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/extras/rpms/plone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26499/devel

Modified Files:
	.cvsignore plone.spec sources 
Added Files:
	Plone-2.5-atxmlperms.patch 
Log Message:
version 2.5

Plone-2.5-atxmlperms.patch:

--- NEW FILE Plone-2.5-atxmlperms.patch ---
--- ./Marshall/handlers/_xml.py.atxmlperms	2006-07-10 13:50:32.000000000 +0200
+++ ./Marshall/handlers/_xml.py	2006-07-10 13:52:17.000000000 +0200
@@ -194,7 +194,7 @@
 XMLREADER_CDATA_NODE_TYPE = 4
 
 # Initialize ATXML RNG Schema
-ATXML_RNG = open(os.path.join(ATXML_SCHEMA, 'atxml.rng'), 'rb+').read()
+ATXML_RNG = open(os.path.join(ATXML_SCHEMA, 'atxml.rng'), 'rb').read()
 
 # libxml2 initialization. Register a per-thread global error callback.
 import libxml2


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	13 Apr 2006 08:55:20 -0000	1.9
+++ .cvsignore	10 Jul 2006 16:19:31 -0000	1.10
@@ -1,2 +1 @@
-Plone-2.1.2.tar.gz
-PloneHotfix20060410.tar.gz
+Plone-2.5.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/plone.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- plone.spec	13 Apr 2006 08:55:20 -0000	1.13
+++ plone.spec	10 Jul 2006 16:19:31 -0000	1.14
@@ -1,18 +1,19 @@
-%define python_minver 2.3.4
-%define zope_minver 2.7.8
+%define python_minver 2.4.2
+%define zope_minver 2.9.3
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.1.2
-Release:        2%{?dist}
+Version:        2.5
+Release:        1%{?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-2.1.2.tar.gz
-Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.5.tar.gz
+#Source10:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
+Patch0:         Plone-2.5-atxmlperms.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,7 +27,8 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version} -a 1
+%setup -q -n Plone-%{version}
+%patch0 -p0 -b .atxmlperms
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -39,7 +41,12 @@
 
 mkdir -p $RPM_BUILD_ROOT%{software_home}/Products
 cp -pr * $RPM_BUILD_ROOT%{software_home}/Products
-rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
+#rm -rf $RPM_BUILD_ROOT%{software_home}/Products/BTreeFolder2
+
+# Included in Zope 2.9
+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
 
@@ -49,9 +56,8 @@
 
 
 %post
-if [ "$1" -ge "2" ]; then # upgrade
-    /sbin/service zope condrestart >/dev/null 2>&1
-fi
+# Make it available to Zope, be it on install or on upgrade
+/sbin/service zope condrestart >/dev/null 2>&1
 
 
 %files
@@ -61,6 +67,11 @@
 
 
 %changelog
+* Mon Jul 10 2006 Aurelien Bompard <abompard at fedoraproject.org> 2.5-1
+- Version 2.5
+- Drop Hotfix, included
+- condrestart Zope on %%post
+
 * Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-2
 - apply Plone Hotfix 2006-04-10 to fix CVE-2006-1711
 - restart Zope on upgrade (will migrate it to %%postun for the


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/devel/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	13 Apr 2006 08:55:20 -0000	1.9
+++ sources	10 Jul 2006 16:19:31 -0000	1.10
@@ -1,2 +1 @@
-863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
-fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz
+0a385a1a4afbf940bb4e094ce5dcb583  Plone-2.5.tar.gz