From e347f36a5b578b4bc497561f18373db2ab734af0 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 19 Mar 2009 01:22:09 +0000 Subject: [PATCH] Monotone-Parent: c54d8d94c481e0cfc4efd1ad03e95f6d10110d10 Monotone-Revision: a1701b3f7bd858b1fc0810b5313e8648bfcb42f6 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-19T01:22:09 Monotone-Branch: ca.inverse.sogo --- Apache/SOGo.conf | 8 ++++---- Main/README | 10 +++++----- Scripts/sogo-init.d-debian | 2 +- Scripts/sogo-init.d-redhat | 4 ++-- Scripts/sogod-wrapper | 25 ++++++++++++------------- sogo.spec | 28 ++++++++++++++-------------- 6 files changed, 38 insertions(+), 39 deletions(-) diff --git a/Apache/SOGo.conf b/Apache/SOGo.conf index 1bc0b9971..6d62b4691 100644 --- a/Apache/SOGo.conf +++ b/Apache/SOGo.conf @@ -1,9 +1,9 @@ Alias /sogo.woa/WebServerResources/ \ - /usr/GNUstep/System/Library/SOGo-0.9/WebServerResources/ + /usr/GNUstep/System/Library/SOGo/WebServerResources/ Alias /SOGo.woa/WebServerResources/ \ - /usr/GNUstep/System/Library/SOGo-0.9/WebServerResources/ + /usr/GNUstep/System/Library/SOGo/WebServerResources/ Alias /SOGO.woa/WebServerResources/ \ - /usr/GNUstep/System/Library/SOGo-0.9/WebServerResources/ + /usr/GNUstep/System/Library/SOGo/WebServerResources/ SetHandler default-handler @@ -26,7 +26,7 @@ Alias /SOGO.woa/WebServerResources/ \ AliasMatch /SOGo/so/ControlPanel/Products/(.*)/Resources/(.*) \ - /usr/GNUstep/System/Library/SOGo-0.9/$1.SOGo/Resources/$2 + /usr/GNUstep/System/Library/SOGo/$1.SOGo/Resources/$2 BalancerMember http://127.0.0.1:20000 retry=1 max=1 timeout=120 diff --git a/Main/README b/Main/README index a814c6f7c..42b2b2b5d 100644 --- a/Main/README +++ b/Main/README @@ -53,7 +53,7 @@ Apache Setup ============ AliasMatch /SOGoHH/so/ControlPanel/Products/(.*)/Resources/(.*) \ - /home/helge/GNUstep/Library/SOGo-0.9/$1.SOGo/Resources/$2 + /home/helge/GNUstep/Library/SOGo/$1.SOGo/Resources/$2 AuthName "Agenor LDAP" @@ -74,15 +74,15 @@ Apache Setup FHS Setup ========= -NOTE: use the appname, sogo-0.9, not the tool name (sogod-0.9)! +NOTE: use the appname, sogo, not the tool name (sogod)! cd /usr/local/share -mkdir sogo-0.9/ -cd sogo-0.9/ +mkdir sogo/ +cd sogo/ ln -s ~/dev/SOGo-trunk/UI/Templates ./templates ln -s ~/dev/SOGo-trunk/UI/WebServerResources ./www Apache: Alias /SOGo.woa/WebServerResources/ \ - /usr/local/share/sogo-0.9/www/ + /usr/local/share/sogo/www/ diff --git a/Scripts/sogo-init.d-debian b/Scripts/sogo-init.d-debian index 8c7d354ca..24d9bdf00 100755 --- a/Scripts/sogo-init.d-debian +++ b/Scripts/sogo-init.d-debian @@ -29,7 +29,7 @@ SOGO_ARGS="" PATH=/sbin:/bin:/usr/sbin:/usr/bin -DAEMON=/usr/sbin/sogod-0.9 +DAEMON=/usr/sbin/sogod NAME=sogo DESC="Scalable OpenGroupware.Org" diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat index ff9e37535..06d669a03 100755 --- a/Scripts/sogo-init.d-redhat +++ b/Scripts/sogo-init.d-redhat @@ -1,7 +1,7 @@ #!/bin/bash # chkconfig: 2345 85 15 # description: SOGo is a groupware server -# processname: sogod-0.9 +# processname: sogod # config: /etc/sysconfig/sogo # config: /etc/httpd/conf.d/SOGo.conf # pidfile: /var/run/sogo/sogod.pid @@ -42,7 +42,7 @@ then . /usr/GNUstep/System/Library/Makefiles/GNUstep.sh fi -REAL_DAEMON=sogod-0.9 +REAL_DAEMON=sogod DAEMON=/usr/sbin/sogod NAME=sogo DESC="Scalable OpenGroupware.Org (Inverse edition)" diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper index 3419c0b3c..b39bcdc8c 100755 --- a/Scripts/sogod-wrapper +++ b/Scripts/sogod-wrapper @@ -40,22 +40,22 @@ else fi fi -if [ -x $GNUSTEP_USER_ROOT/Tools/sogod-0.9 ]; then - sogod="$GNUSTEP_USER_ROOT/Tools/sogod-0.9" -elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then - sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9" -elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod-0.9 ]; then - sogod="$GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod-0.9" -elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9 ]; then - sogod="$GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9" -elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9 ]; then - sogod="$GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9" +if [ -x $GNUSTEP_USER_ROOT/Tools/sogod ]; then + sogod="$GNUSTEP_USER_ROOT/Tools/sogod" +elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/sogod ]; then + sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod" +elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod ]; then + sogod="$GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod" +elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/sogod ]; then + sogod="$GNUSTEP_SYSTEM_ROOT/Tools/sogod" +elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod ]; then + sogod="$GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod" else - echo "Can't find sogod-0.9" + echo "Can't find sogod" exit 1 fi -startport=`defaults read sogod-0.9 WOPort` +startport=`defaults read sogod WOPort` if [ "$?" == "0" ] then startport=`echo $startport | awk '{print $3}'` @@ -74,4 +74,3 @@ echo "SOGOD: $sogod" 2>&1 exec $sogod -WOPort $port >> /var/log/sogo/sogod-$port.log 2>&1 & echo $! > $PIDFILE - diff --git a/sogo.spec b/sogo.spec index e19e87c3d..d1a69d2d5 100644 --- a/sogo.spec +++ b/sogo.spec @@ -155,17 +155,17 @@ rm -fr ${RPM_BUILD_ROOT} /var/run/sogo /var/log/sogo /var/spool/sogo -%{prefix}/Tools/Admin/sogod-0.9 +%{prefix}/Tools/Admin/sogod %{prefix}/Library/Libraries/libSOGo.so.* %{prefix}/Library/Libraries/libSOGoUI.so.* %{prefix}/Library/Libraries/libOGoContentStore.so* -%{prefix}/Library/SOGo-0.9/*.SOGo -%{prefix}/Library/SOGo-0.9/SOGo.framework/Resources -%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/libSOGo.so.* -%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/Resources -%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/Current -%{prefix}/Library/SOGo-0.9/Templates -%{prefix}/Library/SOGo-0.9/WebServerResources +%{prefix}/Library/SOGo/*.SOGo +%{prefix}/Library/SOGo/SOGo.framework/Resources +%{prefix}/Library/SOGo/SOGo.framework/Versions/0/libSOGo.so.* +%{prefix}/Library/SOGo/SOGo.framework/Versions/0/Resources +%{prefix}/Library/SOGo/SOGo.framework/Versions/Current +%{prefix}/Library/SOGo/Templates +%{prefix}/Library/SOGo/WebServerResources %{prefix}/Library/OCSTypeModels/appointment.ocs %{prefix}/Library/OCSTypeModels/contact.ocs %{prefix}/Library/OCSTypeModels/appointment-oracle.ocs @@ -180,12 +180,12 @@ rm -fr ${RPM_BUILD_ROOT} %{prefix}/Library/Headers/SOGoUI %{prefix}/Library/Libraries/libSOGo.so %{prefix}/Library/Libraries/libSOGoUI.so -%{prefix}/Library/SOGo-0.9/SOGo.framework/Headers -%{prefix}/Library/SOGo-0.9/SOGo.framework/libSOGo.so -%{prefix}/Library/SOGo-0.9/SOGo.framework/SOGo -%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/Headers -%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/libSOGo.so -%{prefix}/Library/SOGo-0.9/SOGo.framework/Versions/0/SOGo +%{prefix}/Library/SOGo/SOGo.framework/Headers +%{prefix}/Library/SOGo/SOGo.framework/libSOGo.so +%{prefix}/Library/SOGo/SOGo.framework/SOGo +%{prefix}/Library/SOGo/SOGo.framework/Versions/0/Headers +%{prefix}/Library/SOGo/SOGo.framework/Versions/0/libSOGo.so +%{prefix}/Library/SOGo/SOGo.framework/Versions/0/SOGo %files -n sope%{sope_major_version}%{sope_minor_version}-gdl1-contentstore %defattr(-,root,root,-)