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