This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2005-12-08 01:02:49 UTC Elan Ruusamäe <glen@pld-linux.org> '- killed trailing spaces/tabs'
Cherrypick from master 2006-09-09 01:13:46 UTC Elan Ruusamäe <glen@pld-linux.org> '- Patch4 was outdated':
    Zope.spec -> 1.99
Delete:
    Zope-python-2.3.2.patch
    Zope-zdctl.patch

diff --git a/Zope-python-2.3.2.patch b/Zope-python-2.3.2.patch
deleted file mode 100644 (file)
index 920db6c..0000000
--- a/Zope-python-2.3.2.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -durN Zope-2.7.0-b2.orig/configure Zope-2.7.0-b2/configure
---- Zope-2.7.0-b2.orig/configure       Fri Aug 22 16:07:55 2003
-+++ Zope-2.7.0-b2/configure    Wed Nov 12 17:42:58 2003
-@@ -19,7 +19,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.2.2 2.3 2.3b1 2.3a1 2.3a0"
-+ACCEPTABLE="2.2.2 2.3 2.3b1 2.3a1 2.3a0 2.3.2"
- 
- # provide the executable names for all the acceptable versions
- # (and the target version) below
-@@ -113,7 +113,8 @@
-         out ""
-         out "  The optimimum Python version ($TARGET) was found at $FOUND."
-     elif [ -z "$FOUND1" ] && [ -z "$FOUND2" ] && [ -z "$FOUND3" ] &&
--         [ -z "$FOUND4" ] && [ -z "$FOUND5" ] && [ -z "$FOUND6" ] ; then
-+         [ -z "$FOUND4" ] && [ -z "$FOUND5" ] && [ -z "$FOUND6" ] &&
-+       [ -z "$FOUND7" ] ; then
-         out ""
-         out "  No suitable Python version found.  You should install"
-         out "  Python version $TARGET before continuing.  Versions"
-@@ -138,6 +139,9 @@
-         elif [ -n "$FOUND6" ]; then
-             FOUND=$FOUND6
-             FOUNDVERSION=$FOUNDVERSION6
-+        elif [ -n "$FOUND7" ]; then
-+            FOUND=$FOUND7
-+            FOUNDVERSION=$FOUNDVERSION7
-         fi
-         out ""
-         out "  !! WARNING !! "

diff --git a/Zope-zdctl.patch b/Zope-zdctl.patch
deleted file mode 100644 (file)
index 8f08ddc..0000000
--- a/Zope-zdctl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -urN Zope-2.7.0/lib/python/zdaemon/zdctl.py Zope-2.7.0_chng/lib/python/zdaemon/zdctl.py
---- Zope-2.7.0/lib/python/zdaemon/zdctl.py     2003-10-24 23:32:59.000000000 +0200
-+++ Zope-2.7.0_chng/lib/python/zdaemon/zdctl.py        2004-03-23 13:08:44.808358240 +0100
-@@ -208,9 +208,9 @@
-             args += self._get_override("-z", "directory")
-             args.extend(self.options.program)
-             if self.options.daemon:
--                flag = os.P_WAIT
--            else:
-                 flag = os.P_NOWAIT
-+            else:
-+                flag = os.P_WAIT
-             os.spawnvp(flag, args[0], args)
-         elif not self.zd_pid:
-             self.send_action("start")

diff --git a/Zope.spec b/Zope.spec
index 32449a20cf31f001feac61d3bbb44ab35315f423..e6093369c979f4a7eef4d701952ea13c715fd46d 100644 (file)
--- a/Zope.spec
+++ b/Zope.spec
@@ -1,10 +1,11 @@
-
 # TODO:
 # - check why initgroups() crashes on AMD64 and something, better than
 #   disabling initgroups() completely, with that
 # - no/more secure initial user/password settings (currently: zope/zope)
 # - ZEO support (mkzeoinstance is not tested and probably doesn't work)
 # - perl support?
+# - update to 2.9.x? rename to Zope27?
+# - how to apply the hotfix?
 
 Summary:       An application server and portal toolkit for building Web sites
 Summary(es):   Un servidor de aplicaciones y un conjunto de herramientas para la construcción de sitios Web
@@ -13,7 +14,7 @@ Summary(pt_BR):       Um servidor de aplica
 Name:          Zope
 Version:       2.7.7
 # %%define             sub_ver b2
-Release:       1
+Release:       4
 License:       Zope Public License (ZPL)
 Group:         Networking/Daemons
 Source0:       http://www.zope.org/Products/Zope/%{version}/%{name}-%{version}-final.tgz
@@ -26,15 +27,16 @@ Source5:    %{name}-mkzeoinstance
 Source6:       %{name}-runzope
 Source7:       %{name}-zopectl
 Source8:       %{name}-installzopeproduct
+Source9:       http://www.zope.org/Products/Zope/Hotfix-2006-07-05/Hotfix-20060705/Hotfix_20060705.tar.gz
+# Source9-md5: 6dec58130117fd860adc7fd58f8062e7
 Patch0:                %{name}-default_config.patch
 Patch1:                %{name}-instance_paths.patch
 Patch2:                %{name}-pld_makefile_fix.patch
 Patch3:                %{name}-no_initgroups.patch
-Patch4:                %{name}-python24.patch
 URL:           http://www.zope.org/
 BuildRequires: perl-base
 BuildRequires: python-devel >= 1:2.3.3
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.268
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
@@ -55,6 +57,13 @@ Provides:    user(zope)
 Obsoletes:     Zope-Hotfix = 040713
 Obsoletes:     Zope-Hotfix = 040714
 Obsoletes:     Zope-Hotfix = 050405
+# extracted from lib/python/App/Hotfixes.py
+Obsoletes:     Zope-Hotfix = 2001-09-28
+Obsoletes:     Zope-Hotfix = 2002-03-01
+Obsoletes:     Zope-Hotfix = 2002-04-15
+Obsoletes:     Zope-Hotfix = 2002-06-14
+# See Source9
+Obsoletes:     Zope-Hotfix = 20060704
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                zope_dir /usr/lib/zope
@@ -91,28 +100,24 @@ do Zope, outros sub-pacotes est
 eles ao invés desse RPM.
 
 %prep
-
-%setup -q -n %{name}-%{version}-final
+%setup -q -a9 -n %{name}-%{version}-final
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %ifarch %{x8664} alpha
 %patch3 -p1
 %endif
-%patch4 -p1
+# how to apply the hotfix?
+#mv Hotfix_20060705 lib/python/Products
 
 %build
-perl -pi -e "s|data_dir\s+=\s+.*?join\(INSTANCE_HOME, 'var'\)|data_dir=INSTANCE_HOME|" lib/python/Globals.py
-
 ./configure \
        --prefix=%{zope_dir} \
+       --with-python=%{__python} \
        --optimize
-#      --with-python=/usr/bin/python
 
 %{__make}
 
-perl -pi -e "s|data_dir\s+=\s+.*?join\(INSTANCE_HOME, 'var'\)|data_dir=INSTANCE_HOME|" lib/python/Globals.py
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -121,7 +126,7 @@ install -d $RPM_BUILD_ROOT{/var/lib/zope/main,/var/run/zope,/var/log/zope/main}
        $RPM_BUILD_ROOT{%{_sysconfdir}/zope/main,%{_sbindir}} \
        $RPM_BUILD_ROOT%{zope_dir}/bin
 
-ln -sfn /usr/bin/python $RPM_BUILD_ROOT%{zope_dir}/bin/python
+ln -sfn %{_bindir}/python $RPM_BUILD_ROOT%{zope_dir}/bin/python
 
 %{__make} install \
        INSTALL_FLAGS="--root $RPM_BUILD_ROOT"
@@ -155,25 +160,26 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add zope
-if [ ! -f /etc/zope/main/zope.conf ] ; then
+# TODO: move this migration to trigger
+if [ ! -f %{_sysconfdir}/zope/main/zope.conf ] ; then
        echo "Creating initial 'main' instance..."
-       /usr/sbin/mkzopeinstance main zope:zope
+       %{_sbindir}/mkzopeinstance main zope:zope
        echo "Instance created. Listening on 127.0.0.1:8080, initial user: 'zope' with password: 'zope'"
 else
-       echo "old /etc/zope/zope.conf detected - look at changes about upgrade!" >&2
+       echo "Old %{_sysconfdir}/zope/zope.conf detected - look at changes about upgrade!" >&2
 fi
 was_stopped=0
 for dir in /var/lib/zope/main /var/lib/zope ; do
        if [ -f $dir/Data.fs ]; then
                echo "Found the database in old location. Migrating..."
                if [ -f /var/lock/subsys/zope ]; then
-                       /etc/rc.d/init.d/zope stop >&2
+                       /sbin/service zope stop >&2
                        was_stopped=1
                fi
                umask 022
                [ -d /var/lib/zope/main ] && cd $dir && mv -f Data* /var/lib/zope/main/var 2>/dev/null
                if [ "x$was_stopped" = "x1" ]; then
-                       /etc/rc.d/init.d/zope start >&2
+                       /sbin/service zope start >&2
                fi
                echo "Migration completed (new db location is /var/lib/zope/main/var)"
                break
@@ -181,19 +187,17 @@ for dir in /var/lib/zope/main /var/lib/zope ; do
 done
 if [ -f /var/lock/subsys/zope ]; then
        if [ "x$was_stopped" != "x1" ]; then
-               /etc/rc.d/init.d/zope restart >&2
+               /sbin/service zope restart >&2
        fi
 else
-       echo "look at /etc/zope/main/zope.conf" >&2
-       echo "Run then \"/etc/rc.d/init.d/zope start\" to start Zope." >&2
-       echo "you may create new Zope instances with mkzopeinstance" >&2
+       echo "look at %{_sysconfdir}/zope/main/zope.conf" >&2
+       echo "Run then \"/sbin/service zope start\" to start Zope." >&2
+       echo "You may create new Zope instances with mkzopeinstance" >&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/zope ]; then
-               /etc/rc.d/init.d/zope stop
-       fi
+       %service zope stop
        /sbin/chkconfig --del zope
 fi