In behalf of Adam Szpakowski <worf@optics.polsl.gliwice.pl>:

- version 2.6.1
- lot of documention added
- extended Zope-zserver.sh... corrections for 2.6.1 and locals support (pl_PL)
- changing default ports to 18080 and 18021 for compatibility with squid
- changes in Zope.init... cleaning + switching to CLIENT_HOME

Changed files:
    Zope-zserver.sh -> 1.2
    Zope.init -> 1.2
    Zope.spec -> 1.14

diff --git a/Zope-zserver.sh b/Zope-zserver.sh
index b7a343a1cf37aa82acf5c8af3ca22a272051ec58..37e9a771bd6a93c40faf5031fca39b8dcdea1a8e 100644 (file)
--- a/Zope-zserver.sh
+++ b/Zope-zserver.sh
@@ -1,21 +1,64 @@
 #! /bin/sh
-# $Id$
 
 PATH="/bin:/usr/bin:/usr/sbin:/sbin"
+
+# Zope root folder
 ZOPE_HOME=/usr/lib/zope
+
+# product instalation location
 INSTANCE_HOME=/var/lib/zope
 INST_HOME=${INSTANCE_HOME}
+
+# lacalization of pid and log files for ZOE
 CLIENT_HOME=/var/lib/zope
 
 export INST_HOME INSTANCE_HOME ZOPE_HOME PATH CLIENT_HOME
 
+# user to run Zope
+ZOPE_USER=zope
+
+# put !0 to create separate management process
+CREATE_MANAGEMENT=yes
+
+# initial NUMBER_OF_THREADS
+NUMBER_OF_THREADS=4
+
+# DEBUG_MODE
+DEBUG_MODE=0
+
+# ip address
+IP_ADDRESS=''
+
+# HTTP_PORT
+HTTP_PORT=18080
+
+# FTP_PORT
+FTP_PORT=18021
+
+# MONITOR_PORT... if equals '-' then monitor server is disabled
+MONITOR_PORT='-'
+
+# LOG_FILE
+LOG_FILE=/var/log/zope
+
+# DET_LOG_FILE... detailed log file
+DET_LOG_FILE=/var/log/zope.detailed
+
+# internationalization
+LOC='pl_PL'
+
 exec python $ZOPE_HOME/z2.py            \
-       -u      zope                    \
-       -z      /usr/lib/zope           \
-       -Z      /var/run/zwatchdog.pid  \
-       -w      8080                    \
-       -f      8021                    \
-       -m      ''                      \
-       -l      /var/log/zope           \
-       >>      /var/log/zope 2>&1      \
+       -u      $ZOPE_USER              \
+       -z      $ZOPE_HOME              \
+       -w      $HTTP_PORT              \
+       -f      $FTP_PORT               \
+       -m      $MONITOR_PORT           \
+       -L      $LOC                    \
+       -Z      $CREATE_MANAGEMENT      \
+       -a      $IP_ADDRESS             \
+       -t      $NUMBER_OF_THREADS      \
+       -D      $DEBUG_MODE             \
+       -M      $DET_LOG_FILE           \
+       -l      $LOG_FILE               \
+       >>      $LOG_FILE 2>&1          \
        &

diff --git a/Zope.init b/Zope.init
index 6792ae2b7fcdf7c99a9b6df3d691dbc64f07b51a..cc076d26d21322ba3c1f096402bdad3bb73b0d0e 100644 (file)
--- a/Zope.init
+++ b/Zope.init
@@ -10,9 +10,7 @@
 # Source function library.
 . /etc/rc.d/init.d/functions
 
-ZOPE_HOME=/usr/lib/zope
-INSTANCE_HOME=/var/lib/zope
-INSTANCE_NAME=`basename ${INSTANCE_HOME}`
+CLIENT_HOME=/var/lib/zope
 
 RETVAL=0
 
@@ -33,7 +31,7 @@ case "$1" in
   stop)
         if [ -f /var/lock/subsys/zope ]; then
                 msg_stopping Zope
-                kill `cat ${INSTANCE_HOME}/Z2.pid`
+                kill `cat ${CLIENT_HOME}/Z2.pid`
                sleep 1
                deltext
                ok
@@ -44,9 +42,9 @@ case "$1" in
         fi
        ;;
   status)
-       if ps -p `cat ${INSTANCE_HOME}/Z2.pid | awk '{print $2}'` >/dev/null; then
+       if ps -p `cat ${CLIENT_HOME}/Z2.pid | awk '{print $2}'` >/dev/null; then
            RETVAL=$?
-           echo "Zope (pid `cat ${INSTANCE_HOME}/Z2.pid`) is running"
+           echo "Zope (pid `cat ${CLIENT_HOME}/Z2.pid`) is running"
        else     
            msg_not_running Zope
            RETVAL=1

diff --git a/Zope.spec b/Zope.spec
index e38bc7f163ada53ff8f3309752aeed07b5780df6..4507335036547871b1c66baacb53eec6d598a8f0 100644 (file)
--- a/Zope.spec
+++ b/Zope.spec
@@ -3,8 +3,8 @@ Summary(es):    Un servidor de aplicaciones y un conjunto de herramientas para la c
 Summary(pl):   Serwer aplikacji i toolkit portalowy do tworzenia serwisów WWW
 Summary(pt_BR):        Um servidor de aplicações e um conjunto de ferramentas para construção de sites Web
 Name:          Zope
-Version:       2.6.0
-Release:       3
+Version:       2.6.1
+Release:       1
 License:       Zope Public License (ZPL)
 Group:         Networking/Daemons
 Source0:       http://www.zope.org/Products/%{name}/%{version}/%{name}-%{version}-src.tgz
@@ -16,6 +16,8 @@ Source5:      http://www.zope.org/Documentation/Guides/ZDG/ZDG.html.tgz
 Source6:       http://www.zope.org/Documentation/Guides/ZAG/ZAG.html.tgz
 # note: above documentation is deprecated, zope.org suggests using ZopeBook:
 #Source1:      http://www.zope.org/Members/michel/ZB/ZopeBook.tgz
+# note: changes in location of ZopeBook. Sugestions on Zope.org using this:
+Source9:       http://www.zope.org/Documentation/Books/ZopeBook/current/ZopeBook.tgz
 Source7:       %{name}.init
 Source8:       %{name}-zserver.sh
 URL:           http://www.zope.org/
@@ -76,11 +78,13 @@ eles ao inv
 %prep
 %setup -q -n %{name}-%{version}-src -a4
 mkdir ZopeContentManagersGuide GuideToDTML GuideToZSQL ZopeDevelopersGuide ZopeAdminGuide
+mkdir ZopeBook
 tar xzf %{SOURCE1} -C ZopeContentManagersGuide
 tar xzf %{SOURCE2} -C GuideToDTML
 tar xzf %{SOURCE3} -C GuideToZSQL
 tar xzf %{SOURCE5} -C ZopeDevelopersGuide
 tar xzf %{SOURCE6} -C ZopeAdminGuide
+tar xzf %{SOURCE9} -C ZopeBook
 
 %build
 perl -pi -e "s|data_dir\s+=\s+.*?join\(INSTANCE_HOME, 'var'\)|data_dir=INSTANCE_HOME|" lib/python/Globals.py
@@ -110,6 +114,8 @@ touch $RPM_BUILD_ROOT/var/log/zope
 
 python $RPM_BUILD_ROOT%{_bindir}/zpasswd -u zope -p zope -d localhost $RPM_BUILD_ROOT/var/lib/zope/access
 
+gzip -9nf doc/*.txt *.txt
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -129,7 +135,8 @@ fi
 if [ -f /var/lock/subsys/zope ]; then
        /etc/rc.d/init.d/zope restart >&2
 else
-       echo "Run \"/etc/rc.d/init.d/zope start\" to start Zope." >&2
+       echo "Create inituser using \"zpasswd inituser\" in directory \"/var/lib/zope\"" >&2
+       echo "Run then \"/etc/rc.d/init.d/zope start\" to start Zope." >&2
 fi
 
 %preun
@@ -156,4 +163,4 @@ fi
 %{_libdir}/zope
 %attr(1771,root,zope) %dir /var/lib/zope
 %attr(660,root,zope) %config(noreplace) %verify(not md5 size mtime) /var/lib/zope/*
-%doc *.txt doc/*.txt ZopeContentManagersGuide GuideToZSQL Tutorial ZopeDevelopersGuide ZopeAdminGuide
+%doc *.gz doc/*.gz ZopeContentManagersGuide GuideToZSQL Tutorial ZopeDevelopersGuide ZopeAdminGuide ZopeBook