Author: czarny                       Date: Sun Sep 11 19:52:02 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added init scripts
- added macross for init filenames and syconfig filenames
- used %{__sed} macro
- removed debugging set -x
- more automatic init scripts generation

---- Files affected:
SPECS:
   opengroupware.spec (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: SPECS/opengroupware.spec
diff -u SPECS/opengroupware.spec:1.8 SPECS/opengroupware.spec:1.9
--- SPECS/opengroupware.spec:1.8        Sat Sep 10 21:13:57 2005
+++ SPECS/opengroupware.spec    Sun Sep 11 21:51:57 2005
@@ -1,14 +1,11 @@
 # $Revision$, $Date$
 # TODO: spec filename vs Name
-# - make it build oustide GNUstep directory : /usr/lib/
-# - make proper ./configure build
-# - check %files section
 # - translate all packages to pl
-# - scavange as much as possible from the included spec in maitance
-# - make proper rc-init scripts
-# - scavange and adjust configure files check scripts
 # - check spellings and typos
 # - tweak BR and R to fit PLD
+# - check init scripts
+# - cleanup and rel 1
+# - scavange descriptions of subpackages
 %define                nightlybuild    r1259
 %define                ogo_makeflags   -s
 %define                zid_ver         1.3
@@ -21,15 +18,15 @@
 Summary(pl):   OpenGroupware
 Name:          opengroupware.org
 Version:       1.1
-Release:       0.1
+Release:       0.4
 License:       GPL
 Group:         Libraries
 Source0:       
http://download.opengroupware.org/nightly/sources/trunk/%{name}-trunk-%{nightlybuild}-%{datatrunk}.tar.gz
 # Source0-md5: c141909fa83d0779f8e7931fbcb6bd3b
-Source1:       ogo-webui
-Source2:       ogo-nhsd
-Source3:       ogo-xmlrpcd
-Source4:       ogo-zidestore
+Source1:       ogo-webui.init
+Source2:       ogo-nhsd.init
+Source3:       ogo-xmlrpcd.init
+Source4:       ogo-zidestore.init
 Source5:       ogo-aptnotify.sh
 URL:           http://www.opengroupware.org/
 BuildRequires: apache-devel >= 2.0.40
@@ -62,6 +59,9 @@
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 #echo "LDPATH=/usr/lib/opengroupware.org/Libraries/ix86/linux-gnu/gnu-fd-nil/" 
>> /etc/env.d/50ogo
+
+%define                GNUSTEP_DIR             %{_libdir}/GNUstep-libFoundation
+
 %define                OGO_USER                        ogo
 %define                OGO_GROUP               skyrix
 %define                OGO_HOME                        
%{_var}/lib/opengroupware.org
@@ -73,14 +73,17 @@
 %define                OGO_INIT_VERSION                ogo-webui-%{version}
 %define                OGO_INIT_PREFIX         %{_prefix}
 
+%define                NHSD_SYSCONF                    ogo-nhsd
 %define                NHSD_INIT_NAME                  ogo-nhsd
 %define                NHSD_INIT_VERSION               ogo-nhsd-%{version}
 %define                NHSD_INIT_PREFIX                %{_prefix}
 
+%define                XMLRPCD_SYSCONF                 ogo-xmlrpcd
 %define                XMLRPCD_INIT_NAME                       ogo-xmlrpcd
 %define                XMLRPCD_INIT_VERSION            ogo-xmlrpcd-%{version}
 %define                XMLRPCD_INIT_PREFIX             %{_prefix}
 
+%define                ZIDESTORE_SYSCONF                               
ogo-zidestore
 %define                ZIDESTORE_INIT_NAME                     ogo-zidestore
 %define                ZIDESTORE_INIT_VERSION          ogo-zidestore-%{zide_v}
 %define                ZIDESTORE_INIT_PREFIX           %{_prefix}
@@ -467,8 +470,8 @@
 %setup -q -n opengroupware.org
 
 %build
-#set -x
 . %{_libdir}/GNUstep-libFoundation/System/Library/Makefiles/GNUstep.sh
+export LIBRARY_COMBO="gnu-fd-nil"
 ./configure \
        --prefix=${RPM_BUILD_ROOT}%{_prefix} \
        --enable-debug \
@@ -478,7 +481,6 @@
 %{__make} %{ogo_makeflags}
 
 %install
-#set -x
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_libdir}/GNUstep \
        $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig \
@@ -528,10 +530,10 @@
 
 #ghost initscripts
 INITSCRIPT_DST="${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d"
-touch ${INITSCRIPT_DST}/ogo-nhsd
-touch ${INITSCRIPT_DST}/ogo-webui
-touch ${INITSCRIPT_DST}/ogo-xmlrpcd
-touch ${INITSCRIPT_DST}/ogo-zidestore
+touch ${INITSCRIPT_DST}/%{NHSD_INIT_NAME}
+touch ${INITSCRIPT_DST}/%{OGO_INIT_NAME}
+touch ${INITSCRIPT_DST}/%{XMLRPCD_INIT_NAME}
+touch ${INITSCRIPT_DST}/%{ZIDESTORE_INIT_NAME}
 
 #template for ogo-aptnotify
 APTNOTIFY_TMP_DIR="${SHAREDIR}/aptnotify_template"
@@ -549,26 +551,24 @@
 OGO_USER=\"ogo\"                      # default username (unix) of your OGo 
install - might vary
 PGCLIENTENCODING=\"LATIN1\"           # client encoding to use
 USE_SKYAPTNOTIFY=\"YES\"              # periodically runs aptnotify - or not
-" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/opengroupware-webui
+" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{OGO_SYSCONF}
 
 echo "PGCLIENTENCODING=\"LATIN1\"           # client encoding to use
-" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/opengroupware-nhsd
+" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{NHSD_SYSCONF}
 
 echo "PGCLIENTENCODING=\"LATIN1\"           # client encoding to use
-" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/opengroupware-xmlrpcd
+" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{XMLRPCD_SYSCONF}
 
 echo "PGCLIENTENCODING=\"LATIN1\"           # client encoding to use
-" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/opengroupware-zidestore
+" >$RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/%{ZIDESTORE_SYSCONF}
 
 %pre
-set -x
 if [ "$1" = "1" ]; then
        %groupadd -g 157 "%{OGO_GROUP}"
        %useradd -u 157 -d "%{OGO_HOME}" -s "%{OGO_SHELL}" -c 
"OpenGroupware.org User" -g "%{OGO_GROUP}" "%{OGO_USER}"
 fi
 
 %post
-set -x
 if [ "$1" = "1" ]; then
        cd %{_sysconfdir}
        ln -s %{_var}/lib/opengroupware.org/.libFoundation opengroupware.org
@@ -645,13 +645,12 @@
 /sbin/ldconfig
 
 %post tools
-set -x
 if [ "$1" = "1" ]; then
        CRON_D="%{_sysconfdir}/cron.d"
        if [ -d "$CRON_D" ]; then
                echo "*/5 * * * root %{_bindir}/ogo-aptnotify.sh >/dev/null" 
>%{_sysconfdir}/cron.d/ogo-aptnotify
        fi
-       sed "s^OGO_SYSCONF^%{OGO_SYSCONF}^g; \
+       %{__sed} "s^OGO_SYSCONF^%{OGO_SYSCONF}^g; \
                s^OGO_PREFIX^%{OGO_PREFIX}^g" \
                
"%{_datadir}/opengroupware.org-%{version}/aptnotify_template/ogo-aptnotify.sh" \
                >"%{_bindir}/ogo-aptnotify.sh"
@@ -663,7 +662,7 @@
        if [ -d "$CRON_D" ]; then
                echo "*/5 * * * root %{_bindir}/ogo-aptnotify.sh >/dev/null" 
>%{_sysconfdir}/cron.d/ogo-aptnotify
        fi
-       sed "s^OGO_SYSCONF^%{OGO_SYSCONF}^g; \
+       %{__sed} "s^OGO_SYSCONF^%{OGO_SYSCONF}^g; \
                s^OGO_PREFIX^%{OGO_PREFIX}^g" \
                
"%{_datadir}/opengroupware.org-%{version}/aptnotify_template/ogo-aptnotify.sh" \
                >"%{_bindir}/ogo-aptnotify.sh"
@@ -672,9 +671,11 @@
 
 %post pda
 if [ "$1" = "1" ]; then
-       sed "s^NHSD_INIT_VERSION^%{NHSD_INIT_VERSION}^g; \
-               s^NHSD_INIT_PREFIX^%{NHSD_INIT_PREFIX}^g" \
-               
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd" \
+       %{__sed} -e "s^NHSD_INIT_VERSION^%{NHSD_INIT_VERSION}^g; \
+               s^NHSD_INIT_PREFIX^%{NHSD_INIT_PREFIX}^g; \
+               s^NHSD_SYSCONF^%{NHSD_SYSCONF}^g; \
+               s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+               
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd.init" \
                >%{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
        chown root:root %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
        chmod 755 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
@@ -683,19 +684,23 @@
 fi
 
 if [ "$1" = "2" ]; then
-       if [ ! -f "/etc/rc.d/init.d/ogo-nhsd" ]; then
-               sed "s^NHSD_INIT_VERSION^%{NHSD_INIT_VERSION}^g; \
-               s^NHSD_INIT_PREFIX^%{NHSD_INIT_PREFIX}^g" \
-                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd" \
+       if [ ! -f "/etc/rc.d/init.d/%{NHSD_INIT_NAME}" ]; then
+               %{__sed} "s^NHSD_INIT_VERSION^%{NHSD_INIT_VERSION}^g; \
+               s^NHSD_INIT_PREFIX^%{NHSD_INIT_PREFIX}^g; \
+                       s^NHSD_SYSCONF^%{NHSD_SYSCONF}^g; \
+                       s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd.init" \
                        >%{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
                chown root:root %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
                chmod 755 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
                chkconfig --add "%{NHSD_INIT_NAME}"
                /sbin/ldconfig
        else
-               sed "s^NHSD_INIT_VERSION^%{NHSD_INIT_VERSION}^g; \
-                       s^NHSD_INIT_PREFIX^%{NHSD_INIT_PREFIX}^g" \
-                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd" \
+               %{__sed} "s^NHSD_INIT_VERSION^%{NHSD_INIT_VERSION}^g; \
+                       s^NHSD_INIT_PREFIX^%{NHSD_INIT_PREFIX}^g; \
+                       s^NHSD_SYSCONF^%{NHSD_SYSCONF}^g; \
+                       s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd.init" \
                        >%{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
                chown root:root %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
                chmod 755 %{_sysconfdir}/rc.d/init.d/"%{NHSD_INIT_NAME}"
@@ -708,9 +713,11 @@
 
 %post webui-app
 if [ "$1" = "1" ]; then
-       sed "s^OGO_INIT_VERSION^%{OGO_INIT_VERSION}^g; \
-               s^OGO_INIT_PREFIX^%{OGO_INIT_PREFIX}^g" \
-               
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui" \
+       %{__sed} "s^OGO_INIT_VERSION^%{OGO_INIT_VERSION}^g; \
+               s^OGO_INIT_PREFIX^%{OGO_INIT_PREFIX}^g; \
+               s^OGO_SYSCONF^%{OGO_SYSCONF}^g; \
+               s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+               
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui.init" \
                >%{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
        chown root:root %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
        chmod 755 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
@@ -726,19 +733,23 @@
 fi
 
 if [ "$1" = "2" ]; then
-       if [ ! -f "/etc/rc.d/init.d/ogo-webui" ]; then
-               sed "s^OGO_INIT_VERSION^%{OGO_INIT_VERSION}^g; \
-                       s^OGO_INIT_PREFIX^%{OGO_INIT_PREFIX}^g" \
-                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui" \
+       if [ ! -f "/etc/rc.d/init.d/%{OGO_INIT_NAME}" ]; then
+               %{__sed} "s^OGO_INIT_VERSION^%{OGO_INIT_VERSION}^g; \
+                       s^OGO_INIT_PREFIX^%{OGO_INIT_PREFIX}^g; \
+                       s^OGO_SYSCONF^%{OGO_SYSCONF}^g; \
+                       s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui.init" \
                        >%{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
                chown root:root %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
                chmod 755 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
                chkconfig --add "%{OGO_INIT_NAME}"
                chkconfig "%{OGO_INIT_NAME}" on
        else
-               sed "s^OGO_INIT_VERSION^%{OGO_INIT_VERSION}^g; \
-                       s^OGO_INIT_PREFIX^%{OGO_INIT_PREFIX}^g" \
-                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui" \
+               %{__sed} "s^OGO_INIT_VERSION^%{OGO_INIT_VERSION}^g; \
+                       s^OGO_INIT_PREFIX^%{OGO_INIT_PREFIX}^g; \
+                       s^OGO_SYSCONF^%{OGO_SYSCONF}^g; \
+                       s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui.init" \
                        >%{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
                chown root:root %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
                chmod 755 %{_sysconfdir}/rc.d/init.d/"%{OGO_INIT_NAME}"
@@ -751,9 +762,11 @@
 
 %post xmlrpcd
 if [ "$1" = "1" ]; then
-       sed "s^XMLRPCD_INIT_VERSION^%{XMLRPCD_INIT_VERSION}^g; \
-               s^XMLRPCD_INIT_PREFIX^%{XMLRPCD_INIT_PREFIX}^g" \
-               
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd" \
+       %{__sed} "s^XMLRPCD_INIT_VERSION^%{XMLRPCD_INIT_VERSION}^g; \
+               s^XMLRPCD_INIT_PREFIX^%{XMLRPCD_INIT_PREFIX}^g; \
+               s^XMLRPCD_SYSCONF^%{XMLRPCD_SYSCONF}^g; \
+               s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+               
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd.init"
 \
                >%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
        chown root:root %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
        chmod 755 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
@@ -762,19 +775,23 @@
 fi
 
 if [ "$1" = "2" ]; then
-       if [ ! -f "/etc/init.d/ogo-xmlrpcd" ]; then
-               sed "s^XMLRPCD_INIT_VERSION^%{XMLRPCD_INIT_VERSION}^g; \
-                       s^XMLRPCD_INIT_PREFIX^%{XMLRPCD_INIT_PREFIX}^g" \
-                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd" \
+       if [ ! -f "/etc/init.d/%{XMLRPCD_INIT_NAME}" ]; then
+               %{__sed} "s^XMLRPCD_INIT_VERSION^%{XMLRPCD_INIT_VERSION}^g; \
+                       s^XMLRPCD_INIT_PREFIX^%{XMLRPCD_INIT_PREFIX}^g; \
+                       s^XMLRPCD_SYSCONF^%{XMLRPCD_SYSCONF}^g; \
+                       s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd.init"
 \
                        >%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
                chown root:root 
%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
                chmod 755 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
                chkconfig --add "%{XMLRPCD_INIT_NAME}"
                /sbin/ldconfig
        else
-               sed "s^XMLRPCD_INIT_VERSION^%{XMLRPCD_INIT_VERSION}^g; \
-                       s^XMLRPCD_INIT_PREFIX^%{XMLRPCD_INIT_PREFIX}^g" \
-                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd" \
+               %{__sed} "s^XMLRPCD_INIT_VERSION^%{XMLRPCD_INIT_VERSION}^g; \
+                       s^XMLRPCD_INIT_PREFIX^%{XMLRPCD_INIT_PREFIX}^g; \
+                       s^XMLRPCD_SYSCONF^%{XMLRPCD_SYSCONF}^g; \
+                       s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+                       
"%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd.init"
 \
                        >%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
                chown root:root 
%{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
                chmod 755 %{_sysconfdir}/rc.d/init.d/"%{XMLRPCD_INIT_NAME}"
@@ -787,37 +804,43 @@
 
 %post zidestore
 if [ "$1" = "1" ]; then
-       sed "s^ZIDESTORE_INIT_VERSION^%{ZIDESTORE_INT_VERSION}^g; \
-               s^ZIDESTORE_INIT_PREFIX^%{ZIDESTORE_INT_PREFIX}^g" \
-               
"%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore" \
-               >%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
-       chown root:root %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
-       chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
-       chkconfig --add "%{ZIDESTORE_INT_NAME}"
+       %{__sed} "s^ZIDESTORE_INIT_VERSION^%{ZIDESTORE_INIT_VERSION}^g; \
+               s^ZIDESTORE_INIT_PREFIX^%{ZIDESTORE_INIT_PREFIX}^g; \
+               s^ZIDESTORE_SYSCONF^%{ZIDESTORE_SYSCONF}^g; \   
+               s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+               
"%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore.init" \
+               >%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
+       chown root:root %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
+       chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
+       chkconfig --add "%{ZIDESTORE_INIT_NAME}"
        /sbin/ldconfig
 fi
 
 if [ "$1" = "2" ]; then
-       if [ ! -f "/etc/init.d/ogo-zidestore" ]; then
-               sed "s^ZIDESTORE_INIT_VERSION^%{ZIDESTORE_INT_VERSION}^g; \
-                       s^ZIDESTORE_INIT_PREFIX^%{ZIDESTORE_INT_PREFIX}^g" \
-                       
"%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore" \
-                       >%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
-               chown root:root 
%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
-               chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
-               chkconfig --add "%{ZIDESTORE_INT_NAME}"
+       if [ ! -f "/etc/init.d/%{ZIDESTORE_INIT_NAME}" ]; then
+               %{__sed} "s^ZIDESTORE_INIT_VERSION^%{ZIDESTORE_INIT_VERSION}^g; 
\
+                       s^ZIDESTORE_INIT_PREFIX^%{ZIDESTORE_INIT_PREFIX}^g; \
+                       s^ZIDESTORE_SYSCONF^%{ZIDESTORE_SYSCONF}^g; \
+                       s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+                       
"%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore.init" \
+                       >%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
+               chown root:root 
%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
+               chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
+               chkconfig --add "%{ZIDESTORE_INIT_NAME}"
                /sbin/ldconfig
        else
-               sed "s^ZIDESTORE_INIT_VERSION^%{ZIDESTORE_INT_VERSION}^g; \
-               s^ZIDESTORE_INIT_PREFIX^%{ZIDESTORE_INT_PREFIX}^g" \
-               
"%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore" \
-               >%{_sysconfdir}/init.d/"%{ZIDESTORE_INT_NAME}"
-               chown root:root 
%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
-               chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INT_NAME}"
+               %{__sed} "s^ZIDESTORE_INIT_VERSION^%{ZIDESTORE_INIT_VERSION}^g; 
\
+               s^ZIDESTORE_INIT_PREFIX^%{ZIDESTORE_INIT_PREFIX}^g; \
+               s^ZIDESTORE_SYSCONF^%{ZIDESTORE_SYSCONF}^g; \   
+               s^GNUSTEP_DIR^%{GNUSTEP_DIR}^g" \
+               
"%{_datadir}/zidestore-%{zide_v}/initscript_templates/ogo-zidestore.init" \
+               >%{_sysconfdir}/init.d/"%{ZIDESTORE_INIT_NAME}"
+               chown root:root 
%{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
+               chmod 755 %{_sysconfdir}/rc.d/init.d/"%{ZIDESTORE_INIT_NAME}"
        fi
        /sbin/ldconfig
-       if [ -f "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INT_NAME}" ]; then
-               "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INT_NAME}" restart 
>/dev/null 2>&1
+       if [ -f "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INIT_NAME}" ]; then
+               "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INIT_NAME}" restart 
>/dev/null 2>&1
        fi
 fi
 
@@ -901,11 +924,11 @@
 
 %preun zidestore
 if [ "$1" = "0" ]; then
-       if [ -f "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INT_NAME}" ]; then
-               service "%{ZIDESTORE_INT_NAME}" stop
-               chkconfig "%{ZIDESTORE_INT_NAME}" off
-               chkconfig --del "%{ZIDESTORE_INT_NAME}"
-               rm -f "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INT_NAME}"
+       if [ -f "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INIT_NAME}" ]; then
+               service "%{ZIDESTORE_INIT_NAME}" stop
+               chkconfig "%{ZIDESTORE_INIT_NAME}" off
+               chkconfig --del "%{ZIDESTORE_INIT_NAME}"
+               rm -f "%{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INIT_NAME}"
        fi
        /sbin/ldconfig
 fi
@@ -1040,9 +1063,9 @@
 
%{_libdir}/opengroupware.org-%{version}/datasources/OGoPalmDS.ds/bundle-info.plist
 %{_libdir}/opengroupware.org-%{version}/datasources/OGoPalmDS.ds/stamp.make
 %{_libdir}/opengroupware.org-%{version}/webui/OGoPalm.lso
-%{_datadir}/opengroupware.org-%{version}/initscript_templates/*nhsd
-%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/opengroupware-nhsd
-%ghost %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ogo-nhsd
+%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-nhsd.init
+%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/%{NHSD_SYSCONF}
+%ghost %attr(0755,root,root) %config 
%{_sysconfdir}/rc.d/init.d/%{NHSD_INIT_NAME}
 
 %files pda-devel
 %defattr(-,root,root,-)
@@ -1115,9 +1138,9 @@
 %defattr(-,root,root,-)
 %{_sbindir}/ogo-webui-%{version}
 %{_datadir}/opengroupware.org-%{version}/templates/ogo-webui-%{version}
-%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui
-%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/opengroupware-webui
-%ghost %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/ogo-webui
+%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-webui.init
+%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/%{OGO_SYSCONF}
+%ghost %attr(0755,root,root) %config 
%{_sysconfdir}/rc.d/init.d/%{OGO_INIT_NAME}
 
 %files webui-core
 %defattr(-,root,root,-)
@@ -1278,9 +1301,9 @@
 %files xmlrpcd
 %defattr(-,root,root,-)
 %{_sbindir}/ogo-xmlrpcd-%{version}
-%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd
-%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/opengroupware-xmlrpcd
-%ghost %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/ogo-xmlrpcd
+%{_datadir}/opengroupware.org-%{version}/initscript_templates/ogo-xmlrpcd.init
+%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/%{XMLRPCD_SYSCONF}
+%ghost %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{XMLRPCD_INIT_NAME}
 
 %files zidestore
 %defattr(-,root,root,-)
@@ -1293,8 +1316,8 @@
 %{_libdir}/libZSTasks*.so.%{zide_v}*
 %{_libdir}/zidestore-%{zide_v}
 %{_datadir}/zidestore-%{zide_v}
-%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/opengroupware-zidestore
-%ghost %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/ogo-zidestore
+%attr(0644,root,root) %config(noreplace) 
%{_sysconfdir}/sysconfig/%{ZIDESTORE_SYSCONF}
+%ghost %attr(0755,root,root) %{_sysconfdir}/rc.d/init.d/%{ZIDESTORE_INIT_NAME}
 
 %files zidestore-devel
 %defattr(-,root,root,-)
@@ -1313,6 +1336,13 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/09/11 19:51:57  czarny
+- added init scripts
+- added macross for init filenames and syconfig filenames
+- used %{__sed} macro
+- removed debugging set -x
+- more automatic init scripts generation
+
 Revision 1.8  2005/09/10 19:13:57  czarny
 - scavenged the rest of included spec
 - tweaked %post and %pre scripts
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/opengroupware.spec?r1=1.8&r2=1.9&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to