OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 14-Mar-2004 11:49:56
Branch: HEAD Handle: 2004031410495500
Added files:
openpkg-src/zope zope.conf zopectl zoperun
Modified files:
openpkg-src/zope rc.zope zope.spec
Log:
upgrading package: zope 2.6.4 -> 2.7.0
Summary:
Revision Changes Path
1.2 +5 -67 openpkg-src/zope/rc.zope
1.1 +97 -0 openpkg-src/zope/zope.conf
1.33 +67 -36 openpkg-src/zope/zope.spec
1.1 +9 -0 openpkg-src/zope/zopectl
1.1 +9 -0 openpkg-src/zope/zoperun
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/zope/rc.zope
============================================================================
$ cvs diff -u -r1.1 -r1.2 rc.zope
--- openpkg-src/zope/rc.zope 2 Oct 2003 08:19:14 -0000 1.1
+++ openpkg-src/zope/rc.zope 14 Mar 2004 10:49:55 -0000 1.2
@@ -5,14 +5,6 @@
%config
zope_enable="$openpkg_rc_def"
- zope_instance_name="default"
- zope_http_port="8080"
- zope_ftp_port="8021"
- zope_webdav_port="9800"
- zope_dns_host="''"
- zope_listen_host="127.0.0.1"
- zope_application_threads="4"
- zope_python_interp_check_interval="120"
zope_access_prolog="true"
zope_access_epilog="true"
zope_access_numfiles="10"
@@ -24,67 +16,17 @@
zope_event_numfiles="10"
zope_event_minsize="1M"
zope_event_complevel="9"
- zope_trace_enable="true"
zope_trace_prolog="true"
zope_trace_epilog="true"
zope_trace_numfiles="10"
zope_trace_minsize="1M"
zope_trace_complevel="9"
-%common
- zope_software_home="@l_prefix@/lib/zope"
- zope_instance_home="@l_prefix@/var/zope/$zope_instance_name"
- zope_access_log_file="$zope_instance_home/var/access.log"
- zope_event_log_file="$zope_instance_home/var/event.log"
- zope_trace_log_file="$zope_instance_home/var/trace.log"
- zope_pidfile="$zope_instance_home/var/Z2.pid"
- zope_servers="-X"
- if [ -n $zope_http_port ]; then
- zope_servers="$zope_servers -w $zope_http_port"
- fi
- if [ -n $zope_ftp_port ]; then
- zope_servers="$zope_servers -f $zope_ftp_port"
- fi
- if [ -n $zope_webdav_port ]; then
- zope_servers="$zope_servers -w $zope_webdav_port"
- fi
- zope_opts="-d $zope_dns_host"
- if [ -n $zope_listen_host ]; then
- zope_opts="$zope_opts -a $zope_listen_host"
- else
- zope_opts="$zope_opts -a ''"
- fi
- zope_opts="$zope_opts -t $zope_application_threads"
- zope_opts="$zope_opts -i $zope_python_interp_check_interval"
- zope_opts="$zope_opts -l $zope_access_log_file"
- if [ "$zope_trace_enable" == "true" ]; then
- zope_opts="$zope_opts -M $zope_trace_log_file"
- fi
- zope_env=""
- if [ -n $zope_event_log_level ]; then
- zope_env="$zope_env EVENT_LOG_FILE=$zope_event_log_file"
- zope_env="$zope_env EVENT_LOG_LEVEL=$zope_event_log_level"
- fi
- zope_args="$zope_servers $zope_opts $zope_env"
- zope_signal () {
- if [ -f ${zope_pidfile} ]; then
- kill -$1 `cat ${zope_pidfile}`
- return $?
- else
- return 1
- fi
- }
-
%status -u @l_rusr@ -o
zope_usable="unknown"
zope_active="no"
rcService zope enable yes && \
- if [ -f ${zope_pidfile} ]; then
- zope_signal 0
- if [ $? -eq 0 ]; then
- zope_active="yes"
- fi
- fi
+ @l_prefix@/bin/zopectl status | grep -q "pid=" && zope_active="yes"
echo "zope_enable=\"$zope_enable\""
echo "zope_usable=\"$zope_usable\""
echo "zope_active=\"$zope_active\""
@@ -92,25 +34,21 @@
%start -p 400 -u @l_rusr@
rcService zope enable yes || exit 0
rcService zope active yes && exit 0
- export SOFTWARE_HOME=$zope_software_home
- export INSTANCE_HOME=$zope_instance_home
- export PYTHONPATH=$SOFTWARE_HOME
- @l_prefix@/bin/python @l_prefix@/libexec/zope/z2.py $zope_args
+ @l_prefix@/bin/zopectl start
%stop -p 400 -u @l_rusr@
rcService zope enable yes || exit 0
rcService zope active no && exit 0
- zope_signal TERM
+ @l_prefix@/bin/zopectl stop
%restart -p 400 -u @l_rusr@
rcService zope enable yes || exit 0
- rc zope stop
- rc zope start
+ @l_prefix@/bin/zopectl restart
%reload -p 400 -u @l_rusr@
rcService zope enable yes || exit 0
rcService zope active no && exit 0
- zope_signal HUP
+ @l_prefix@/bin/zopectl logrotate
%daily -u @l_rusr@
rcService zope enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zope/zope.conf
============================================================================
$ cvs diff -u -r0 -r1.1 zope.conf
--- /dev/null 2004-03-14 11:49:55.000000000 +0100
+++ zope.conf 2004-03-14 11:49:55.000000000 +0100
@@ -0,0 +1,97 @@
+##
+## zope.conf -- Zope Configuration
+##
+## Please see @l_prefix@/lib/zope/Zope/Startup/zopeschema.xml for
+## a fully-annotated description of the allowed values.
+##
+
+%define INSTANCE @l_prefix@/var/zope
+
+instancehome $INSTANCE
+debug-mode off
+
+<zoperunner>
+ program @l_prefix@/bin/zoperun
+ daemon true
+ backoff-limit 10
+ forever false
+ default-to-interactive true
+ #socket-name $INSTANCE/var/zope.zdsock
+ #exit-codes 0, 2
+ #directory $INSTANCE
+ #user zope-kr
+ #python @l_prefix@/bin/python
+ #zdrun @l_prefix@/lib/zope/zdaemon/zdrun.py
+ #logfile $INSTANCE/var/event.log
+</zoperunner>
+
+<http-server>
+ address 127.0.0.1:8080
+</http-server>
+
+<ftp-server>
+ address 127.0.0.1:8021
+</ftp-server>
+
+#<webdav-source-server>
+# address 127.0.0.1:1980
+# force-connection-close off
+#</webdav-source-server>
+#
+#<icp-server>
+# address 127.0.0.1:888
+#</icp-server>
+
+# Main FileStorage database
+<zodb_db main>
+ <filestorage>
+ path $INSTANCE/var/Data.fs
+ </filestorage>
+ mount-point /
+</zodb_db>
+
+<zodb_db temporary>
+ <temporarystorage>
+ name temporary storage for sessioning
+ </temporarystorage>
+ mount-point /temp_folder
+ container-class Products.TemporaryFolder.TemporaryContainer
+</zodb_db>
+
+#<zodb_db main>
+# mount-point /
+# <zeoclient>
+# server localhost:8100
+# storage 1
+# name zeostorage
+# var $INSTANCE/var
+# </zeoclient>
+#</zodb_db>
+
+<eventlog>
+ level all
+ <logfile>
+ path $INSTANCE/log/event.log
+ level info
+ </logfile>
+</eventlog>
+
+<logger access>
+ level WARN
+ <logfile>
+ path $INSTANCE/log/Z2.log
+ format %(message)s
+ </logfile>
+</logger>
+
+#<logger trace>
+# level WARN
+# <syslog-handler>
+# host localhost
+# port 514
+# </syslog-handler>
+# <nteventlog-handler>
+# appname Zope
+# </nteventlog-handler>
+#</logger>
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zope/zope.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 zope.spec
--- openpkg-src/zope/zope.spec 12 Feb 2004 08:02:10 -0000 1.32
+++ openpkg-src/zope/zope.spec 14 Mar 2004 10:49:55 -0000 1.33
@@ -26,27 +26,30 @@
# package information
Name: zope
Summary: Content Management System and Application Server
-URL: http://www.zope.org/
+URL: http://zope.org/
Vendor: Zope Corporation
Packager: The OpenPKG Project
Distribution: OpenPKG
Class: PLUS
Group: Web
License: Zope Public License
-Version: 2.6.4
-Release: 20040212
+Version: 2.7.0
+Release: 20040314
# list of sources
-Source0: http://www.zope.org/Products/Zope/%{version}/Zope-%{version}-src.tgz
+Source0: http://zope.org/Products/Zope/%{version}/Zope-%{version}.tgz
Source1: rc.zope
+Source2: zoperun
+Source3: zopectl
+Source4: zope.conf
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130
PreReq: OpenPKG, openpkg >= 20040130
-BuildPreReq: python >= 2.2.3
-PreReq: python >= 2.2.3
+BuildPreReq: python >= 2.3.3
+PreReq: python >= 2.3.3
AutoReq: no
AutoReqProv: no
@@ -60,63 +63,75 @@
%track
prog zope = {
version = %{version}
- url = http://www.zope.org/Products/Zope/
- regex = Zope-(\d+\.\d+\.\d+)-src\.tgz
+ url = http://zope.org/Products/Zope/
+ regex = Zope-(\d+\.\d+\.\d+)\.tgz
}
%prep
- %setup -q -n Zope-%{version}-src
+ %setup -q -n Zope-%{version}
%build
# build package
CC="%{l_cc}" \
CFLAGS="%{l_cflags -O}" \
- %{l_prefix}/bin/python setup.py build_ext \
- --force
+ ./configure \
+ --with-python=%{l_prefix}/bin/python
+ %{l_make} %{l_mflags}
%install
rm -rf $RPM_BUILD_ROOT
# install package
- %{l_prefix}/bin/python setup.py install \
- --root=$RPM_BUILD_ROOT \
- --prefix=%{l_prefix} \
- --install-purelib=%{l_prefix}/lib/zope \
- --install-platlib=%{l_prefix}/lib/zope \
- --install-headers=%{l_prefix}/include \
- --install-scripts=%{l_prefix}/bin \
- --no-compile
+ INSTALL_FLAGS="--install-purelib=$RPM_BUILD_ROOT%{l_prefix}/lib/zope"
+ INSTALL_FLAGS="$INSTALL_FLAGS
--install-platlib=$RPM_BUILD_ROOT%{l_prefix}/lib/zope"
+ INSTALL_FLAGS="$INSTALL_FLAGS
--install-data=$RPM_BUILD_ROOT%{l_prefix}/lib/zope"
+ INSTALL_FLAGS="$INSTALL_FLAGS
--install-headers=$RPM_BUILD_ROOT%{l_prefix}/include"
+ INSTALL_FLAGS="$INSTALL_FLAGS
--install-scripts=$RPM_BUILD_ROOT%{l_prefix}/libexec/zope"
+ INSTALL_FLAGS="$INSTALL_FLAGS --no-compile"
+ %{l_make} %{l_mflags} install \
+ PREFIX=%{l_prefix} \
+ INSTALL_FLAGS="$INSTALL_FLAGS"
- # strip down installation
- rm -rf $RPM_BUILD_ROOT%{l_prefix}/lib/zope/import
-
- # install additional scripts
+ # install addon utilities
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/zope \
$RPM_BUILD_ROOT%{l_prefix}/bin
- %{l_shtool} install -c -m 755 \
- z2.py inst/compilezpy.py \
- $RPM_BUILD_ROOT%{l_prefix}/libexec/zope/
- %{l_shtool} install -c -m 755 \
- -e 's;/usr/bin/env python;%{l_prefix}/bin/python;' \
- zpasswd.py \
- $RPM_BUILD_ROOT%{l_prefix}/bin/zpasswd
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE zopectl} $RPM_BUILD_ROOT%{l_prefix}/bin/
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE zoperun} $RPM_BUILD_ROOT%{l_prefix}/bin/
+
+ # install configuration
+ %{l_shtool} mkdir -f -p -m 755 \
+ $RPM_BUILD_ROOT%{l_prefix}/etc/zope
+ %{l_shtool} install -c -m 755 %{l_value -s -a} \
+ %{SOURCE zope.conf} $RPM_BUILD_ROOT%{l_prefix}/etc/zope/
# create Zope instance home
%{l_shtool} mkdir -f -p -m 755 \
- $RPM_BUILD_ROOT%{l_prefix}/var/zope/default/var
+ $RPM_BUILD_ROOT%{l_prefix}/var/zope \
+ $RPM_BUILD_ROOT%{l_prefix}/var/zope/import \
+ $RPM_BUILD_ROOT%{l_prefix}/var/zope/log \
+ $RPM_BUILD_ROOT%{l_prefix}/var/zope/var \
+ $RPM_BUILD_ROOT%{l_prefix}/var/zope/Products \
+ $RPM_BUILD_ROOT%{l_prefix}/var/zope/Extensions
+
+ # strip down installation
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/README.txt
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/doc
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/import
+ rm -rf $RPM_BUILD_ROOT%{l_prefix}/skel
# install run-command script
%{l_shtool} mkdir -f -p -m 755 \
$RPM_BUILD_ROOT%{l_prefix}/etc/rc.d
%{l_shtool} install -c -m 755 %{l_value -s -a} \
- %{SOURCE rc.zope} \
- $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
+ %{SOURCE rc.zope} $RPM_BUILD_ROOT%{l_prefix}/etc/rc.d/
# determine installation files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
%{l_files_std} \
- '%attr(700,%{l_rusr},%{l_rgrp}) %dir %{l_prefix}/var/zope/default/var'
+ '%attr(700,%{l_rusr},%{l_rgrp}) %dir %{l_prefix}/var/zope/log' \
+ '%attr(700,%{l_rusr},%{l_rgrp}) %dir %{l_prefix}/var/zope/var'
%files -f files
@@ -133,6 +148,21 @@
$RPM_INSTALL_PREFIX/libexec/zope/compilezpy.py
) >/dev/null 2>&1 || true
+ # give information about next steps
+ if [ $1 -eq 1 ]; then
+ ( echo "You have successfully installed Zope. In order to use it, you first"
+ echo "have to create a management user by running the following command"
+ echo "(before starting up Zope):"
+ echo " \$ $RPM_INSTALL_PREFIX/bin/zopectl adduser <user> <password>"
+ echo "After this you can startup Zope with"
+ echo " \$ $RPM_INSTALL_PREFIX/etc/rc zope start"
+ echo "and connect to it through the URL:"
+ echo " http://localhost:8080/";
+ echo "Use the created <user> and <password> to login to its management"
+ echo "interface in order to configure Zope to your particular needs."
+ ) | %{l_rpmtool} msg -b -t notice
+ fi
+
%preun
[ $1 -eq 0 ] || exit 0
@@ -145,6 +175,7 @@
) || true
# remove log files
- rm -rf $RPM_INSTALL_PREFIX/var/zope/default/var/* >/dev/null 2>&1 || true
+ rm -rf $RPM_INSTALL_PREFIX/var/zope/var/* >/dev/null 2>&1 || true
+ rm -rf $RPM_INSTALL_PREFIX/var/zope/log/* >/dev/null 2>&1 || true
exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zope/zopectl
============================================================================
$ cvs diff -u -r0 -r1.1 zopectl
--- /dev/null 2004-03-14 11:49:55.000000000 +0100
+++ zopectl 2004-03-14 11:49:55.000000000 +0100
@@ -0,0 +1,9 @@
+#! /bin/sh
+PYTHON="@l_prefix@/bin/python"
+INSTANCE_HOME="@l_prefix@/var/zope"
+CONFIG_FILE="@l_prefix@/etc/zope/zope.conf"
+SOFTWARE_HOME="@l_prefix@/lib/zope"
+PYTHONPATH="$SOFTWARE_HOME"
+export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
+ZDCTL="$SOFTWARE_HOME/Zope/Startup/zopectl.py"
+exec "$PYTHON" "$ZDCTL" -C "$CONFIG_FILE" "$@"
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/zope/zoperun
============================================================================
$ cvs diff -u -r0 -r1.1 zoperun
--- /dev/null 2004-03-14 11:49:55.000000000 +0100
+++ zoperun 2004-03-14 11:49:56.000000000 +0100
@@ -0,0 +1,9 @@
+#! /bin/sh
+PYTHON="@l_prefix@/bin/python"
+INSTANCE_HOME="@l_prefix@/var/zope"
+CONFIG_FILE="@l_prefix@/etc/zope/zope.conf"
+SOFTWARE_HOME="@l_prefix@/lib/zope"
+PYTHONPATH="$SOFTWARE_HOME"
+export PYTHONPATH INSTANCE_HOME SOFTWARE_HOME
+ZOPE_RUN="$SOFTWARE_HOME/Zope/Startup/run.py"
+exec "$PYTHON" "$ZOPE_RUN" -C "$CONFIG_FILE" "$@"
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
