rpms/plone/FC-4 .cvsignore, 1.6, 1.7 plone.spec, 1.10, 1.11 sources, 1.6, 1.7

[Aurelien Bompard (abompard)]

Author: abompard

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

Modified Files:
	.cvsignore plone.spec sources 
Log Message:
fix bug 188886 (CVE-2006-1711)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	8 Sep 2005 21:38:54 -0000	1.6
+++ .cvsignore	13 Apr 2006 08:55:13 -0000	1.7
@@ -1 +1,2 @@
-Plone-2.1.tar.gz
+Plone-2.1.2.tar.gz
+PloneHotfix20060410.tar.gz


Index: plone.spec
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/plone.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- plone.spec	8 Sep 2005 21:38:54 -0000	1.10
+++ plone.spec	13 Apr 2006 08:55:13 -0000	1.11
@@ -1,17 +1,18 @@
 %define python_minver 2.3.4
-%define zope_minver 2.7.0
+%define zope_minver 2.7.8
 
 %define zope_home      %{_libdir}/zope
 %define software_home  %{zope_home}/lib/python
 
 Name:           plone
-Version:        2.1
-Release:        1%{?dist}
+Version:        2.1.2
+Release:        2%{?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.tar.gz
+Source0:        http://dl.sf.net/plone/Plone-2.1.2.tar.gz
+Source1:        http://plone.org/products/plonehotfix20060410/releases/1.0/PloneHotfix20060410.tar.gz
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,7 +26,7 @@
 products.
 
 %prep
-%setup -q -n Plone-%{version}
+%setup -q -n Plone-%{version} -a 1
 # Clean up sources
 find . -type d -name CVS | xargs rm -rf
 find . -type f -name .cvsignore | xargs rm -rf
@@ -47,6 +48,12 @@
 rm -rf $RPM_BUILD_ROOT
 
 
+%post
+if [ "$1" -ge "2" ]; then # upgrade
+    /sbin/service zope condrestart >/dev/null 2>&1
+fi
+
+
 %files
 %defattr(644,root,root,755)
 %doc README.txt CONTENTS.txt
@@ -54,6 +61,18 @@
 
 
 %changelog
+* 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
+  next release, but we need to make sure zope is restarted for
+  this one (security)
+
+* Wed Feb 22 2006 Aurelien Bompard <gauret[AT]free.fr> 2.1.2-1
+- version 2.1.2
+
+* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1.1-1
+- version 2.1.1
+
 * Thu Sep 08 2005 Aurelien Bompard <gauret[AT]free.fr> 2.1-1
 - version 2.1 final
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/plone/FC-4/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	8 Sep 2005 21:38:54 -0000	1.6
+++ sources	13 Apr 2006 08:55:13 -0000	1.7
@@ -1 +1,2 @@
-a72efb9aace662ac8f81f3f66ad7c44c  Plone-2.1.tar.gz
+863311e29550f9b4bf6c2502fdbed1fa  Plone-2.1.2.tar.gz
+fecdb36acae4751f6a8975c2068247c3  PloneHotfix20060410.tar.gz