From 936e3fcbf65d6cb1047a7964d19158703fc4012f Mon Sep 17 00:00:00 2001 From: Jeremy Katz Date: Mon, 23 Oct 2006 19:48:13 +0000 Subject: [PATCH 01/16] Initialize branch FC-6 for zope --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..d5b6362 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +FC-6 From 6433cea78af5d0d723218634a4f875b808214c13 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 04:52:42 +0000 Subject: [PATCH 02/16] Updated so plone provides the product 'Five' rather then Zope. Zope needed to provide Five in Plone 2.5. In Plone 2.5.1, Plone now provides Five. Fun. --- zope.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/zope.spec b/zope.spec index 0b352cc..07e9f74 100644 --- a/zope.spec +++ b/zope.spec @@ -13,7 +13,7 @@ Name: zope Summary: Web application server for flexible content management applications Version: 2.9.4 -Release: 2%{?dist} +Release: 3%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ @@ -120,6 +120,9 @@ chmod 755 $RPM_BUILD_ROOT%{zope_home} # 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" @@ -187,6 +190,10 @@ fi %changelog +* Tue Nov 21 2006 Jonathan Steffan 2.9.4-3 +- Removed Five from zope package (plone 2.5.1 now provides the needed + version.) + * Wed Aug 30 2006 Aurelien Bompard 2.9.4-2 - fix path on x86_64 From 0ae158a358cc04223debb03b18172bb42afef5fa Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 18:22:32 +0000 Subject: [PATCH 03/16] Updated to 2.9.5 --- .cvsignore | 2 +- sources | 2 +- zope-2.8.3-pythonwarning.patch | 13 ------------- zope.spec | 19 ++++++------------- 4 files changed, 8 insertions(+), 28 deletions(-) delete mode 100644 zope-2.8.3-pythonwarning.patch diff --git a/.cvsignore b/.cvsignore index 7b0b3ec..7a648a7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zope-2.9.4-final.tgz +Zope-2.9.5-final.tgz diff --git a/sources b/sources index 5d42a7d..4b963c3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d7ffe62eabc84d0c438e450e344c29f Zope-2.9.4-final.tgz +17cd06a6974dbdd0e4982a343b79fb00 Zope-2.9.5-final.tgz diff --git a/zope-2.8.3-pythonwarning.patch b/zope-2.8.3-pythonwarning.patch deleted file mode 100644 index 4cb8e0d..0000000 --- a/zope-2.8.3-pythonwarning.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- ./lib/python/App/dtml/zope_quick_start.dtml.pythonwarning 2005-10-25 15:23:22.000000000 +0200 -+++ ./lib/python/App/dtml/zope_quick_start.dtml 2005-10-25 15:35:55.000000000 +0200 -@@ -134,5 +134,10 @@ - - - -+

-+WARNING: you are running Zope 2.8.X with python 2.4.X, this is not a supported -+combination. Don't file bugreports or ask for support on zope.org. -+

-+ - - diff --git a/zope.spec b/zope.spec index 07e9f74..772fcef 100644 --- a/zope.spec +++ b/zope.spec @@ -12,13 +12,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.9.4 -Release: 3%{?dist} +Version: 2.9.5 +Release: 1%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.9.4/Zope-2.9.4-final.tgz -#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz +Source0: http://www.zope.org/Products/Zope/2.9.5/Zope-2.9.5-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -28,7 +27,6 @@ Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in Patch0: zope-2.7.3-config.patch -Patch1: zope-2.8.3-pythonwarning.patch BuildRequires: python-devel >= %{python_minver} BuildRequires: python >= %{python_minver} @@ -46,18 +44,11 @@ systems. After starting Zope, you can access it by pointing your browser to http://localhost:8080 -WARNING: this zope package has been built on python 2.4.X, which is not -supported ! Do not file bugreports or ask for support on zope.org if you -choose to use this package. - - %prep %setup -q -n Zope-%{version}-final %patch0 -p2 -b .config # remove the backup, or we'll install it too... rm -f skel/etc/zope.conf.in.config -# Warning on the default index_html about python 2.4 & zope 2.8 -#%patch1 -p1 -b .pythonwarning chmod -x skel/import/README.txt install -pm 644 %{SOURCE4} README.Fedora @@ -188,8 +179,10 @@ fi %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc - %changelog +* Tue Nov 22 2006 Jonathan Steffan 2.9.5-1 +- Updated to 2.9.5 and removed not needed patches + * Tue Nov 21 2006 Jonathan Steffan 2.9.4-3 - Removed Five from zope package (plone 2.5.1 now provides the needed version.) From dbe5148f7ceac54b87da7b003841fb3d1c4baea2 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 19:57:32 +0000 Subject: [PATCH 04/16] Added configure script patch for python 2.4.4 --- zope.configure-2.9.5.patch | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 zope.configure-2.9.5.patch diff --git a/zope.configure-2.9.5.patch b/zope.configure-2.9.5.patch new file mode 100644 index 0000000..52883be --- /dev/null +++ b/zope.configure-2.9.5.patch @@ -0,0 +1,19 @@ +*** 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 From 7d625ec758cf67419effd641de26a66590e904d5 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 22 Nov 2006 21:55:01 +0000 Subject: [PATCH 05/16] Added patch to enable support for python 2.4.4 --- zope.configure-2.9.5.patch | 30 +++++++++++------------------- zope.spec | 2 ++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/zope.configure-2.9.5.patch b/zope.configure-2.9.5.patch index 52883be..b695b42 100644 --- a/zope.configure-2.9.5.patch +++ b/zope.configure-2.9.5.patch @@ -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 diff --git a/zope.spec b/zope.spec index 772fcef..f54da66 100644 --- a/zope.spec +++ b/zope.spec @@ -27,6 +27,7 @@ Source4: zope-README.Fedora 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 @@ http://localhost:8080 %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 From 3cc99b847bac3e2927ce742a14ad2d65b9ff6dc3 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sat, 6 Jan 2007 06:44:22 +0000 Subject: [PATCH 06/16] updated to 2.9.6 and added Five back to zope --- .cvsignore | 2 +- sources | 2 +- zope.spec | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7a648a7..08ddf14 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zope-2.9.5-final.tgz +Zope-2.9.6-final.tgz diff --git a/sources b/sources index 4b963c3..d38d248 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -17cd06a6974dbdd0e4982a343b79fb00 Zope-2.9.5-final.tgz +a87008a9e78248072ea5908e1006b269 Zope-2.9.6-final.tgz diff --git a/zope.spec b/zope.spec index f54da66..12da08e 100644 --- a/zope.spec +++ b/zope.spec @@ -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 @@ Source4: zope-README.Fedora 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 @@ http://localhost:8080 %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 @@ chmod 755 $RPM_BUILD_ROOT%{zope_home} # 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 @@ fi %changelog +* Fri Jan 5 2007 Jonathan Steffan 2.9.6-1 +- Updated to 2.9.6 added Five back into Zope (#221252) + * Tue Nov 22 2006 Jonathan Steffan 2.9.5-1 - Updated to 2.9.5 and removed not needed patches From 1a3deaad4f6e55eb465c907fa7a1304175b97277 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sat, 6 Jan 2007 07:26:03 +0000 Subject: [PATCH 07/16] Needed to add back the configure patch --- zope.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zope.spec b/zope.spec index 12da08e..bada861 100644 --- a/zope.spec +++ b/zope.spec @@ -27,7 +27,7 @@ Source4: zope-README.Fedora 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 @@ http://localhost:8080 %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 From 0748dcc12c608b4cd10e968ce16ef26e9c510a5e Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 21 Mar 2007 22:12:32 +0000 Subject: [PATCH 08/16] added hotfix 20070320 --- .cvsignore | 1 + sources | 1 + zope.spec | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 08ddf14..b84b1eb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ Zope-2.9.6-final.tgz +Hotfix_20070320.tgz diff --git a/sources b/sources index d38d248..9d0de2d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ a87008a9e78248072ea5908e1006b269 Zope-2.9.6-final.tgz +80806d50d9b88d0d0db9cc22255617bd Hotfix_20070320.tgz diff --git a/zope.spec b/zope.spec index bada861..82db37d 100644 --- a/zope.spec +++ b/zope.spec @@ -13,7 +13,7 @@ Name: zope Summary: Web application server for flexible content management applications Version: 2.9.6 -Release: 1%{?dist} +Release: 2%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ @@ -26,6 +26,7 @@ Source3: zope.zopectl.in Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in +Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz Patch0: zope-2.7.3-config.patch Patch1: zope.configure-2.9.5.patch @@ -105,7 +106,7 @@ perl -pi -e 's,<>,%{_sysconfdir},g; make install # Hotfix -#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products +tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products chmod 700 $RPM_BUILD_ROOT%{instance_home} chmod 755 $RPM_BUILD_ROOT%{zope_home} @@ -179,6 +180,9 @@ fi %changelog +* Wed Mar 21 2007 Jonathan Steffan 2.9.6-2 +- Added hotfix 20070320 (#233378) + * Fri Jan 5 2007 Jonathan Steffan 2.9.6-1 - Updated to 2.9.6 added Five back into Zope (#221252) From 86a4aa55863c36f48b8a1a9fa5feed0e560bd39d Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sun, 8 Apr 2007 04:20:17 +0000 Subject: [PATCH 09/16] Updated to 2.9.7 --- .cvsignore | 3 +-- sources | 3 +-- zope.spec | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index b84b1eb..696f3c5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -Zope-2.9.6-final.tgz -Hotfix_20070320.tgz +Zope-2.9.7-final.tgz diff --git a/sources b/sources index 9d0de2d..de1b0b6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -a87008a9e78248072ea5908e1006b269 Zope-2.9.6-final.tgz -80806d50d9b88d0d0db9cc22255617bd Hotfix_20070320.tgz +f7d900c00fe95d4cce0bc5854bc842b4 Zope-2.9.7-final.tgz diff --git a/zope.spec b/zope.spec index 82db37d..7cde275 100644 --- a/zope.spec +++ b/zope.spec @@ -12,12 +12,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.9.6 -Release: 2%{?dist} +Version: 2.9.7 +Release: 1%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.9.6/Zope-2.9.6-final.tgz +Source0: http://www.zope.org/Products/Zope/2.9.7/Zope-2.9.7-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -26,9 +26,9 @@ Source3: zope.zopectl.in Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in -Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz +#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz 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} @@ -49,7 +49,7 @@ http://localhost:8080 %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 @@ -106,7 +106,7 @@ perl -pi -e 's,<>,%{_sysconfdir},g; make install # Hotfix -tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products +#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products chmod 700 $RPM_BUILD_ROOT%{instance_home} chmod 755 $RPM_BUILD_ROOT%{zope_home} @@ -180,6 +180,11 @@ fi %changelog +* Mon Apr 2 2007 Jonathan Steffan 2.9.7-1 +- Removed hotfix 20070320 +- Updated to 2.9.7 +- Removed no longer needed patch for acceptable python version + * Wed Mar 21 2007 Jonathan Steffan 2.9.6-2 - Added hotfix 20070320 (#233378) From fa1cbed84822f00ee88c07cc011563b921c7d93c Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Wed, 23 May 2007 20:58:09 +0000 Subject: [PATCH 10/16] Added zope.pth --- zope.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/zope.spec b/zope.spec index 7cde275..ba89894 100644 --- a/zope.spec +++ b/zope.spec @@ -1,5 +1,7 @@ %define python_minver 2.4.2 +%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} + %define zope_user zope %define zope_group %{zope_user} @@ -13,7 +15,7 @@ Name: zope Summary: Web application server for flexible content management applications Version: 2.9.7 -Release: 1%{?dist} +Release: 2%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ @@ -75,7 +77,7 @@ rm -rf $RPM_BUILD_ROOT # Create all required additional directories for dir in %{zope_home} %{software_home} %{instance_home}/{Products,bin,var} \ %{_sysconfdir}/sysconfig %{_bindir}; do - mkdir -p $RPM_BUILD_ROOT$dir + install -d $RPM_BUILD_ROOT$dir done @@ -118,6 +120,11 @@ rm -rf $RPM_BUILD_ROOT%{zope_home}/doc echo "Zope %{version}-%{release}" > \ "$RPM_BUILD_ROOT%{software_home}/version.txt" +# write zope.pth +install -d $RPM_BUILD_ROOT%{python_sitearch} +echo "%{software_home}" > \ + "$RPM_BUILD_ROOT%{python_sitearch}/zope.pth" + # Compile .pyc %{__python} -c "import compileall; \ compileall.compile_dir(\"$RPM_BUILD_ROOT%{zope_home}\", \ @@ -177,9 +184,13 @@ fi %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt %attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var %attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc +%{python_sitearch}/zope.pth %changelog +* Wed May 23 2007 Jonathan Steffan 2.9.7-2 +- Added zope.pth to fix misc. zope scripts including some zeo stuff + * Mon Apr 2 2007 Jonathan Steffan 2.9.7-1 - Removed hotfix 20070320 - Updated to 2.9.7 From cbd76f563116fae5c5a373fa9fd4ad721e5cc81e Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Mon, 6 Aug 2007 16:27:18 +0000 Subject: [PATCH 11/16] Update to 2.9.8 --- .cvsignore | 2 +- sources | 2 +- zope.configure-2.9.5.patch | 11 ----------- zope.spec | 9 ++++++--- 4 files changed, 8 insertions(+), 16 deletions(-) delete mode 100644 zope.configure-2.9.5.patch diff --git a/.cvsignore b/.cvsignore index 696f3c5..4bfdccf 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zope-2.9.7-final.tgz +Zope-2.9.8-final.tgz diff --git a/sources b/sources index de1b0b6..3624434 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f7d900c00fe95d4cce0bc5854bc842b4 Zope-2.9.7-final.tgz +ad7acd2378568264cc301657ee79d361 Zope-2.9.8-final.tgz diff --git a/zope.configure-2.9.5.patch b/zope.configure-2.9.5.patch deleted file mode 100644 index b695b42..0000000 --- a/zope.configure-2.9.5.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 diff --git a/zope.spec b/zope.spec index ba89894..219d1a0 100644 --- a/zope.spec +++ b/zope.spec @@ -14,12 +14,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.9.7 -Release: 2%{?dist} +Version: 2.9.8 +Release: 1%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.9.7/Zope-2.9.7-final.tgz +Source0: http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -188,6 +188,9 @@ fi %changelog +* Mon Aug 6 2007 Jonathan Steffan 2.9.8-1 +- Updated to 2.9.8 + * Wed May 23 2007 Jonathan Steffan 2.9.7-2 - Added zope.pth to fix misc. zope scripts including some zeo stuff From d8c769481a30bbf6855fcd52e0109d9db36bd2d9 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sat, 15 Sep 2007 21:32:12 +0000 Subject: [PATCH 12/16] Update Zope to 2.10.4 for use with Plone 3 --- .cvsignore | 2 +- sources | 2 +- zope-2.10.4-config.patch | 18 ++++ zope-2.7.3-config.patch | 27 ----- zope.spec | 218 +++++---------------------------------- 5 files changed, 43 insertions(+), 224 deletions(-) create mode 100644 zope-2.10.4-config.patch delete mode 100644 zope-2.7.3-config.patch diff --git a/.cvsignore b/.cvsignore index 4bfdccf..e6baf09 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zope-2.9.8-final.tgz +Zope-2.10.4-final.tgz diff --git a/sources b/sources index 3624434..9935cb7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad7acd2378568264cc301657ee79d361 Zope-2.9.8-final.tgz +07dde81bdfe42ca00f73912b3d73e0ec Zope-2.10.4-final.tgz diff --git a/zope-2.10.4-config.patch b/zope-2.10.4-config.patch new file mode 100644 index 0000000..51b5bd7 --- /dev/null +++ b/zope-2.10.4-config.patch @@ -0,0 +1,18 @@ +--- skel/etc/zope.conf.in.orig 2007-08-14 00:14:05.000000000 -0600 ++++ skel/etc/zope.conf.in 2007-08-14 00:14:49.000000000 -0600 +@@ -148,6 +148,7 @@ + # + # effective-user chrism + ++effective-user zope + + # Directive: enable-product-installation + # +@@ -288,6 +289,7 @@ + # + # mime-types $INSTANCE/etc/mime.types + ++mime-types /etc/mime.types + + # Directive: structured-text-header-level + # diff --git a/zope-2.7.3-config.patch b/zope-2.7.3-config.patch deleted file mode 100644 index 6dad0d3..0000000 --- a/zope-2.7.3-config.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- ./Zope/skel/etc/zope.conf.in.config 2004-09-28 20:08:52.000000000 +0200 -+++ ./Zope/skel/etc/zope.conf.in 2004-12-10 18:27:55.393492142 +0100 -@@ -138,6 +138,7 @@ - # - # effective-user chrism - -+effective-user <> - - # Directive: enable-product-installation - # -@@ -295,6 +296,7 @@ - # - # mime-types $INSTANCE/etc/mime.types - -+mime-types /etc/mime.types - - # Directive: structured-text-header-level - # -@@ -491,7 +493,7 @@ - # - # Example: - # --# security-policy-implementation python -+security-policy-implementation python - - # Directive: skip-authentication-checking - # diff --git a/zope.spec b/zope.spec index 219d1a0..e0edc0b 100644 --- a/zope.spec +++ b/zope.spec @@ -1,4 +1,4 @@ -%define python_minver 2.4.2 +%define python_minver 2.4.3 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} @@ -14,12 +14,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.9.8 -Release: 1%{?dist} +Version: 2.10.4 +Release: 3%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz +Source0: http://www.zope.org/Products/Zope/2.10.4/Zope-2.10.4-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -28,13 +28,10 @@ Source3: zope.zopectl.in Source4: zope-README.Fedora Source5: zope.logrotate.in Source6: zope.logrotate.cron.in -#Source10: http://www.zope.org/Products/Zope/Hotfix-2007-03-20/Hotfix-20070320/Hotfix_20070320.tgz -Patch0: zope-2.7.3-config.patch -#Patch1: zope.configure-2.9.5.patch +Patch0: zope-2.10.4-config.patch -BuildRequires: python-devel >= %{python_minver} -BuildRequires: python >= %{python_minver} -Requires: python >= %{python_minver} +BuildRequires: python-devel >= %{python_minver}, python >= %{python_minver} +Requires: python >= %{python_minver}, libxml2-python, python-elementtree Requires(pre): /usr/sbin/useradd Requires(post): /sbin/chkconfig @@ -50,10 +47,7 @@ http://localhost:8080 %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 +%patch0 -p0 chmod -x skel/import/README.txt install -pm 644 %{SOURCE4} README.Fedora @@ -107,10 +101,14 @@ perl -pi -e 's,<>,%{_sysconfdir},g; # Actually copy all the other files over make install -# Hotfix -#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products +chmod 750 $RPM_BUILD_ROOT%{instance_home} + +# Set needed permissions +# We might go as far as to only allow zope r/w to the .pyc files +for dir in %{instance_home}/{Products,log,lib,var}; do + chmod 775 $RPM_BUILD_ROOT$dir +done -chmod 700 $RPM_BUILD_ROOT%{instance_home} chmod 755 $RPM_BUILD_ROOT%{zope_home} # included in %%doc @@ -156,7 +154,7 @@ fi %files %defattr(-, root, root, -) -%doc doc/* README.Fedora +%doc doc/* README.Fedora ZopePublicLicense.txt %config(noreplace) %{_sysconfdir}/sysconfig/zope %config %{_initrddir}/zope %config %{_sysconfdir}/cron.daily/zope-logrotate @@ -174,187 +172,17 @@ fi %{zope_home}/skel/README.txt %{zope_home}/skel/var %config %{zope_home}/skel/etc -%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home} -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Extensions -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/import -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/log -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/lib -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/Products -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/README.txt -%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/var -%attr(-, %{zope_user}, %{zope_group}) %config %{instance_home}/etc +%attr(-, root, %{zope_group}) %{instance_home}/* %{python_sitearch}/zope.pth %changelog -* Mon Aug 6 2007 Jonathan Steffan 2.9.8-1 -- Updated to 2.9.8 +* Mon Sep 3 2007 Jonathan Steffan 2.10.4-3 +- Updated Requires for libxml2-python and python-elementtree -* Wed May 23 2007 Jonathan Steffan 2.9.7-2 -- Added zope.pth to fix misc. zope scripts including some zeo stuff +* Tue Aug 14 2007 Jonathan Steffan 2.10.4-2 +- Added config patch -* Mon Apr 2 2007 Jonathan Steffan 2.9.7-1 -- Removed hotfix 20070320 -- Updated to 2.9.7 -- Removed no longer needed patch for acceptable python version - -* Wed Mar 21 2007 Jonathan Steffan 2.9.6-2 -- Added hotfix 20070320 (#233378) - -* Fri Jan 5 2007 Jonathan Steffan 2.9.6-1 -- Updated to 2.9.6 added Five back into Zope (#221252) - -* Tue Nov 22 2006 Jonathan Steffan 2.9.5-1 -- Updated to 2.9.5 and removed not needed patches - -* Tue Nov 21 2006 Jonathan Steffan 2.9.4-3 -- Removed Five from zope package (plone 2.5.1 now provides the needed - version.) - -* Wed Aug 30 2006 Aurelien Bompard 2.9.4-2 -- fix path on x86_64 - -* Wed Aug 30 2006 Aurelien Bompard 2.9.4-1 -- update to 2.9.4 - -* Wed Aug 2 2006 Ville Skyttä - 2.9.3-4 -- Security: fix world-writable permissions on logrotate config files - and README.Fedora (#200794). - -* Mon Jul 10 2006 Aurelien Bompard 2.9.3-3 -- try to fix build on x86_64 (take 2) - -* Mon Jul 10 2006 Aurelien Bompard 2.9.3-2 -- try to fix build on x86_64 (take 1) - -* Mon Jul 10 2006 Aurelien Bompard 2.9.3-1 -- version 2.9.3 -- add Hotfix_20060705 - -* Thu Apr 13 2006 Aurelien Bompard 2.9.2-1 -- version 2.9.2 - -* Tue Feb 21 2006 Aurelien Bompard 2.8.5-1 -- version 2.8.5 - -* Tue Oct 25 2005 Aurelien Bompard 2.8.3-3 -- rebuild - -* Tue Oct 25 2005 Aurelien Bompard 2.8.3-2 -- add warning about zope 2.8 & python 2.4 (bug 171681) - -* Sat Oct 22 2005 Aurelien Bompard 2.8.3-1 -- version 2.8.3 - -* Sat Oct 15 2005 Aurelien Bompard 2.8.2-1 -- version 2.8.2 - -* Sat Sep 10 2005 Aurelien Bompard 2.8.1-1 -- version 2.8.1 - -* Sun Jun 12 2005 Aurelien Bompard 2.8.0-2 -- rebuild - -* Sat Jun 11 2005 Aurelien Bompard 2.8.0-1 -- version 2.8.0 - -* Sun Jun 05 2005 Aurelien Bompard 2.7.6-2 -- don't remove the zope user un postun (to keep the Data.fs to the - correct owner after removal) - -* Sun May 08 2005 Aurelien Bompard 2.7.6-1%{?dist} -- version 2.7.6 -- use disttag - -* Thu Apr 07 2005 Aurelien Bompard 2.7.5-2.fc4 -- add hotfix - -* Thu Mar 24 2005 Aurelien Bompard 2.7.5-1.fc4 -- version 2.7.5 -- drop Epoch -- change release tag for FC4 -- convert some tabs into spaces - -* Wed Jan 26 2005 Aurelien Bompard 2.7.4-1 -- version 2.7.4 -- flag the documentation as %%doc -- make %%zope_home go+rx to allow users to create instances and to allow - access to docs -- add a logrotate cron job -- flag config files as %%config even in %%zope_home and %%instance_home - -* Fri Dec 10 2004 Aurelien Bompard 2.7.3-0.fdr.6 -- activate "security-policy-implementation python" in zope.conf - -* Sun Nov 21 2004 Aurelien Bompard 2.7.3-0.fdr.5 -- revert to zope's default directory tree to allow multiple instances -- make the zopectl script multiple-instaces-aware. -- add README.Fedora - -* Fri Nov 12 2004 Aurelien Bompard 2.7.3-0.fdr.4 -- compile scripts in %zope_home/bin too -- keep skel dir in %zope_home to fix mkzopeinstance -- BuildRequire python, since python-devel doesn't require it. - -* Fri Nov 12 2004 Aurelien Bompard 2.7.3-0.fdr.3 -- compile .pyc instead of just touch-ing them - -* Thu Nov 11 2004 Aurelien Bompard 2.7.3-0.fdr.2 -- deal with leftover .pyc files -- minor spec cleanups - -* Thu Nov 11 2004 Aurelien Bompard 2.7.3-0.fdr.1 -- fix scriptlets requirements -- use standard buildroot -- replace %%buildroot by RPM_BUILD_ROOT -- update to 2.7.3 -- drop Hotfix -- drop patch 1, fixed upstream - -* Tue Aug 10 2004 Aurelien Bompard 2.7.2-0.fdr.3 -- add hotfix from Zope.org: - http://zope.org/Products/Zope/Hotfix-200400807/Hotfix-20040807-alert - -* Wed Aug 04 2004 Aurelien Bompard 2.7.2-0.fdr.2 -- add patch to warn the user that the initial user cannot be added while - Zope is running (from Chris McDonough) - -* Wed Aug 04 2004 Aurelien Bompard 2.7.2-0.fdr.1 -- version 2.7.2 -- remove leftover byte-compilation in %%post -- Zope 2.7.x really requires python >= 2.3.3 - -* Wed Jul 14 2004 Rex Dieter 2.7.1-0.fdr.1 -- 2.7.1 -- move files created in %%post back into rpm. Unowned files are bad. -- make (theoretically) buildable for all rh73-rh90,fc1/2,el3 - NOTE: lowerred python_minver to 2.2.2 to test builds, though (most) - docs claim 2.3.3 is required. (??) -- don't use Requires(preun,postun) -- use %%_smp_mflags - -* Tue Apr 28 2004 Chris McDonough 2.7.0-0.fdr.1 -- Prep for submission to Fedora.us by revising work done by Matthias -- Refer to source files by URL instead of by name -- Write version.txt into software home in post -- Don't ship byte-compiled files, instead compile them in post -- Add patch for inverted P_WAIT/P_NOWAIT in zdctl (fixes startup) -- Add patch for objectmanager bug that could effect sites that depend - on userid/username separation -- Improved init script (OK and FAILED now are printed at the appropriate - times) -- Remove runzope workaround by adding a stanza to the - config file. -- Start in runlevels 345. -- Known issues: - - zopectl is started and runs as the root user at boot time, - (although Zope itself runs as the zope user) - - no distro-specific docs telling people which port the software - runs on or how to add a user via zopectl adduser. - -* Wed Feb 18 2004 Matthias Saou 2.7.0-0.6.fr -- Initial RPM release. -- The startup/stop needs to be modified further. -- Currently "zopectl" returns an error although Zope does start... +* Wed Aug 1 2007 Jonathan Steffan 2.10.4-1 +- Initial Package From 47eb85a97acb4bb7d2ff8fe62baa854f9d17526a Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Sat, 3 Nov 2007 23:30:06 +0000 Subject: [PATCH 13/16] Update to 2.10.5 --- .cvsignore | 2 +- sources | 2 +- zope.spec | 9 ++++++--- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index e6baf09..535e58f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -Zope-2.10.4-final.tgz +Zope-2.10.5-final.tgz diff --git a/sources b/sources index 9935cb7..563dddd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -07dde81bdfe42ca00f73912b3d73e0ec Zope-2.10.4-final.tgz +55c0f0c32e41ab3262991b10da967d85 Zope-2.10.5-final.tgz diff --git a/zope.spec b/zope.spec index e0edc0b..d84cf76 100644 --- a/zope.spec +++ b/zope.spec @@ -14,12 +14,12 @@ Name: zope Summary: Web application server for flexible content management applications -Version: 2.10.4 -Release: 3%{?dist} +Version: 2.10.5 +Release: 1%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ -Source0: http://www.zope.org/Products/Zope/2.10.4/Zope-2.10.4-final.tgz +Source0: http://www.zope.org/Products/Zope/2.10.5/Zope-2.10.5-final.tgz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source1: zope.init.in @@ -177,6 +177,9 @@ fi %changelog +* Sat Nov 3 2007 Jonathan Steffan 2.10.5-1 +- Update to zope 2.10.5 + * Mon Sep 3 2007 Jonathan Steffan 2.10.4-3 - Updated Requires for libxml2-python and python-elementtree From 6e17043de927ae2cb3d49797e112f1eb29d05cf1 Mon Sep 17 00:00:00 2001 From: Jonathan Steffan Date: Fri, 9 Nov 2007 02:51:04 +0000 Subject: [PATCH 14/16] Fix permissions --- zope.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/zope.spec b/zope.spec index d84cf76..bad3073 100644 --- a/zope.spec +++ b/zope.spec @@ -15,7 +15,7 @@ Name: zope Summary: Web application server for flexible content management applications Version: 2.10.5 -Release: 1%{?dist} +Release: 2%{?dist} License: ZPL Group: System Environment/Daemons URL: http://www.zope.org/ @@ -42,8 +42,7 @@ Zope is an application server framework that enables developers to quickly build web applications such as intranets, portals, and content management systems. -After starting Zope, you can access it by pointing your browser to -http://localhost:8080 +Zope, by default, will listen on port 8080. %prep %setup -q -n Zope-%{version}-final @@ -103,6 +102,10 @@ make install chmod 750 $RPM_BUILD_ROOT%{instance_home} +# Fix permissions, must have changed in the upstream tar +chmod 755 $RPM_BUILD_ROOT%{instance_home}/bin/zopectl +chmod 755 $RPM_BUILD_ROOT%{instance_home}/bin/runzope + # Set needed permissions # We might go as far as to only allow zope r/w to the .pyc files for dir in %{instance_home}/{Products,log,lib,var}; do @@ -177,6 +180,9 @@ fi %changelog +* Thu Nov 8 2007 Jonathan Steffan 2.10.5-2 +- Update permissions for zopectl and runzope + * Sat Nov 3 2007 Jonathan Steffan 2.10.5-1 - Update to zope 2.10.5 From 6b2deed2ef9a57215f28ffe059b8da670959e830 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:09:00 +0000 Subject: [PATCH 15/16] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2d94525..524fddb 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: zope -# $Id$ +# $Id: Makefile,v 1.1 2005/01/09 12:06:32 scop Exp $ NAME := zope SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 538cf7728bfa9548bd8607e6dbb9b7d7a66aa614 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 16:32:53 +0000 Subject: [PATCH 16/16] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 524fddb..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: zope -# $Id: Makefile,v 1.1 2005/01/09 12:06:32 scop Exp $ -NAME := zope -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index d5b6362..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -FC-6