summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Wickert <wickert@kolabsys.com>2011-04-15 19:24:23 (GMT)
committerChristoph Wickert <wickert@kolabsys.com>2011-04-15 20:03:15 (GMT)
commit6cd4a12f6e36d61403c0ee53e50158a4c87868a0 (patch)
tree0c235d831759c295738950fe42e928252fc8b9b1
parentd6ae6b24dbb1f6cce1bd9fa9d4c854fcfdc64cca (diff)
downloadserver-6cd4a12f6e36d61403c0ee53e50158a4c87868a0.tar.gz
revert 7b17e2ac and 6330a460 since openpkg didn't like it
-rw-r--r--openpkg/kolab.patch28
-rw-r--r--release-notes.txt6
2 files changed, 1 insertions, 33 deletions
diff --git a/openpkg/kolab.patch b/openpkg/kolab.patch
index 14aaa3d..3d6e732 100644
--- a/openpkg/kolab.patch
+++ b/openpkg/kolab.patch
@@ -17,7 +17,7 @@ diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec
# the package version/release
%define V_openpkg 20071227
-+%define V_release 20071227_kolab3
++%define V_release 20071227_kolab2
# the used software versions
%define V_rpm 4.2.1
@@ -39,32 +39,6 @@ diff -urN openpkg/openpkg.spec openpkg-kolab/openpkg.spec
# list of sources
Source0: ftp://alpha.gnu.org/gnu/patch/patch-%{V_patch}.tar.gz
-@@ -1950,6 +1949,25 @@
- echo "## openpkg-${name} -- startup/shutdown transfer script for OpenPKG ${prefix} hierarchy"
- echo "##"
- echo ""
-+ echo "# chkconfig: 99 00"
-+ echo "# description: Kolab is a Groupware Solution for Emails, Appointments,\"
-+ echo "# Contacts and more."
-+ echo "# config: ${prefix}/etc/kolab/kolab.conf"
-+ echo ""
-+ echo "### BEGIN INIT INFO"
-+ echo "# Provides: kolab spamassassin amavisd apache httpd clamav imapd postfix sasl saslauthd openldap MTA"
-+ echo "# Required-Start: $local_fs $network $remote_fs $named"
-+ echo "# Required-Stop: $local_fs $network $remote_fs"
-+ echo "# Should-Start: $syslog"
-+ echo "# Should-Stop: $syslog"
-+ echo "# Default-Start: 2 3 4 5"
-+ echo "# Default-Stop: 0 1 6"
-+ echo "# Short-Description: Startup/Shutdown script for OpenPKG ${prefix} hierarchy"
-+ echo "# Description: Kolab is a Groupware Solution for Emails, Appointments,"
-+ echo "# Contacts and more. This script starts/stops the OpenPKG"
-+ echo "# ${prefix} hierarchy."
-+ echo "### END INIT INFO"
-+ echo ""
- echo "depend() {"
- echo " after *"
- echo "}"
diff -urN openpkg/rpmtool openpkg-kolab/rpmtool
--- openpkg/rpmtool 2007-10-11 22:40:43.000000000 +0200
+++ openpkg-kolab/rpmtool 2009-09-23 15:45:25.946152864 +0200
diff --git a/release-notes.txt b/release-notes.txt
index 5e6edb9..31dc4cb 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -47,12 +47,6 @@ Changes between 2.3-alpha and 2.3.0:
Update to 2.4.23
- - openpkg-20071227-20071227_kolab3
-
- kolab/issue4531 (/etc/init.d/kolab needs LSB headers)
- kolab/issue4693 (Kolab 2.3-alpha install error on Debian squeeze)
- kolab/issue4677 (Kolab server 2.2.4 fails to build on Ubuntu natty)
-
- php-5.3.5-20110301
Update to 5.3.5