dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-Zope-2.9.4-final.tgz

.gitignore

@@ -0,0 +1 @@
+Zope-2.10.5-final.tgz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: zope
-# $Id$
-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
-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)

sources

@@ -1 +1 @@
-7d7ffe62eabc84d0c438e450e344c29f  Zope-2.9.4-final.tgz
+55c0f0c32e41ab3262991b10da967d85  Zope-2.10.5-final.tgz

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
+ #

zope-2.7.3-config.patch

@@ -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 <<ZOPE_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
- #

zope-2.8.3-pythonwarning.patch

@@ -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 @@
- 
- </ul>
- 
-+<p style="color: red; font-weight: bold">
-+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.
-+</p>
-+
- </body>
- </html>

zope.spec

@@ -1,4 +1,6 @@
-%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)")}
 
 %define zope_user      zope
 %define zope_group     %{zope_user}
@@ -12,13 +14,12 @@
 
 Name:    zope
 Summary: Web application server for flexible content management applications
-Version: 2.9.4
+Version: 2.10.5
 Release: 2%{?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
+Source0: http://www.zope.org/Products/Zope/2.10.5/Zope-2.10.5-final.tgz
-#Source10: http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source1: zope.init.in
@@ -27,12 +28,10 @@ Source3: zope.zopectl.in
 Source4: zope-README.Fedora
 Source5: zope.logrotate.in
 Source6: zope.logrotate.cron.in
-Patch0:  zope-2.7.3-config.patch
+Patch0: zope-2.10.4-config.patch
-Patch1:  zope-2.8.3-pythonwarning.patch
 
-BuildRequires: python-devel >= %{python_minver} 
+BuildRequires: python-devel >= %{python_minver}, python >= %{python_minver} 
-BuildRequires: python >= %{python_minver} 
+Requires:      python >= %{python_minver}, libxml2-python, python-elementtree
-Requires:      python >= %{python_minver}
 
 Requires(pre): /usr/sbin/useradd
 Requires(post): /sbin/chkconfig
@@ -43,21 +42,11 @@ 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
+Zope, by default, will listen on port 8080.
-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
+%patch0 -p0
-# 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
@@ -81,7 +70,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
 
 
@@ -111,10 +100,18 @@ perl -pi -e 's,<<SYSCONFDIR>>,%{_sysconfdir},g;
 # Actually copy all the other files over
 make install
 
-# Hotfix
+chmod 750 $RPM_BUILD_ROOT%{instance_home}
-#tar -xzf %{SOURCE10} -C $RPM_BUILD_ROOT%{software_home}/Products
+
+# 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
+    chmod 775 $RPM_BUILD_ROOT$dir
+done
 
-chmod 700 $RPM_BUILD_ROOT%{instance_home}
 chmod 755 $RPM_BUILD_ROOT%{zope_home}
 
 # included in %%doc
@@ -124,6 +121,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}\", \
@@ -155,7 +157,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
@@ -173,163 +175,23 @@ fi
 %{zope_home}/skel/README.txt
 %{zope_home}/skel/var
 %config %{zope_home}/skel/etc
-%attr(-, %{zope_user}, %{zope_group}) %dir %{instance_home}
+%attr(-, root, %{zope_group}) %{instance_home}/*
-%attr(-, %{zope_user}, %{zope_group}) %{instance_home}/bin
+%{python_sitearch}/zope.pth
-%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
-
 
 
 %changelog
-* Wed Aug 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 2.9.4-2
+* Thu Nov 8 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.5-2
-- fix path on x86_64
+- Update permissions for zopectl and runzope
 
-* Wed Aug 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 2.9.4-1
+* Sat Nov 3 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.5-1
-- update to 2.9.4
+- Update to zope 2.10.5
 
-* Wed Aug  2 2006 Ville Skyttä <ville.skytta at iki.fi> - 2.9.3-4
+* Mon Sep 3 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-3
-- Security: fix world-writable permissions on logrotate config files
+- Updated Requires for libxml2-python and python-elementtree
-  and README.Fedora (#200794).
 
-* Mon Jul 10 2006 Aurelien Bompard <abompard@fedoraproject.org> 2.9.3-3
+* Tue Aug 14 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-2
-- try to fix build on x86_64 (take 2)
+- Added config patch
 
-* Mon Jul 10 2006 Aurelien Bompard <abompard@fedoraproject.org> 2.9.3-2
+* Wed Aug 1 2007 Jonathan Steffan <jon a fedoraunity.org> 2.10.4-1
-- try to fix build on x86_64 (take 1)
+- Initial Package
-
-* Mon Jul 10 2006 Aurelien Bompard <abompard@fedoraproject.org> 2.9.3-1
-- version 2.9.3
-- add Hotfix_20060705
-
-* Thu Apr 13 2006 Aurelien Bompard <gauret[AT]free.fr> 2.9.2-1
-- version 2.9.2
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 2.8.5-1
-- version 2.8.5
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-3
-- rebuild
-
-* Tue Oct 25 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-2
-- add warning about zope 2.8 & python 2.4 (bug 171681)
-
-* Sat Oct 22 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.3-1
-- version 2.8.3
-
-* Sat Oct 15 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.2-1
-- version 2.8.2
-
-* Sat Sep 10 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.1-1
-- version 2.8.1
-
-* Sun Jun 12 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-2
-- rebuild
-
-* Sat Jun 11 2005 Aurelien Bompard <gauret[AT]free.fr> 2.8.0-1
-- version 2.8.0
-
-* Sun Jun 05 2005 Aurelien Bompard <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 2.7.6-1%{?dist}
-- version 2.7.6
-- use disttag
-
-* Thu Apr 07 2005 Aurelien Bompard <gauret[AT]free.fr> 2.7.5-2.fc4
-- add hotfix
-
-* Thu Mar 24 2005 Aurelien Bompard <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 2.7.3-0.fdr.6
-- activate "security-policy-implementation python" in zope.conf
-
-* Sun Nov 21 2004 Aurelien Bompard <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 2.7.3-0.fdr.3
-- compile .pyc instead of just touch-ing them
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 2.7.3-0.fdr.2
-- deal with leftover .pyc files
-- minor spec cleanups
-
-* Thu Nov 11 2004 Aurelien Bompard <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 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 <gauret[AT]free.fr> 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 <rexdieter at sf.net> 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 <chrism@plope.com> 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 <zoperunner> 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 <http://freshrpms.net/> 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...