New update target for 2.2.5.

1 files changed, 14 insertions, 81 deletions

diff --git a/update.mk b/update.mk
index 62eab96..d4d905d 100644
--- a/update.mk
+++ b/update.mk
@@ -1,108 +1,41 @@
 # Declare the packages that were updated between versions here. Each
 # package must provide a "make install" procedure that will allow to
-# update packages from CVS. Currently
+# update packages from CVS.
+#
 
 # These are the packages that were updated from Kolab Server version
-# 2.2.3 to 2.2.4.
-UPDATES_2.2.3_2.2.4=openssl                 \
-                    http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/x509-0-20090125.src.rpm@ \
-                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/apr-1.2.12-20080101.src.rpm@with_ldap \
-                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/imap-2006k-20080101.src.rpm@with_annotate \
-                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/curl-7.17.1-20080101.src.rpm@ \
-                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/perl-crypto-5.10.0-20080101.src.rpm@ \
-                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/perl-ssl-5.10.0-20080101.src.rpm@ \
-                    http://files.kolab.org/server/release/kolab-server-2.2.3/sources/sasl-2.1.22-20080101.src.rpm@with_login,with_ldap,with_ntlm \
-                    apache                  \
-                    apache-php              \
-                    php                     \
-                    openldap                \
-                    imapd                   \
-                    postfix                 \
-                    kolabd                  \
-                    clamav                  \
-
-# These are the packages that were updated from Kolab Server version
-# 2.2.2 to 2.2.3.
-UPDATES_2.2.2_2.2.3=clamav                  \
-                    db                      \
-                    imapd                   \
-                    kolabd                  \
-                    pear/PEAR-Net_LDAP2     \
-                    php-kolab/Kolab_Filter  \
-                    php-kolab/Kolab_Server  \
-                    kolab-webadmin          \
-                    kolab-webclient         \
-# Hm, we can't update these automatically...
-#                    openpkg                 \
-#                    perl-kolab              \
-#                    procmail
+# 2.2.4 to 2.2.5.
+UPDATES_2.2.4_2.2.5=kolabd                  \
 
 # Set the new version we are aiming at after each release.
-CVS_VERSION=2.2.4
+CVS_VERSION=2.2.5
 # Determines the current version
 CURRENT_VERSION=$(shell $(KOLABDIR)/bin/openpkg rpm -q kolabd | sed -e 's/kolabd-\([0-9.]*\)-[0-9]*/\1/')
 
 KOLAB_SERVER_CVS=KOLAB_SERVER-$(CVS_VERSION)
 KOLAB_SERVER_CURRENT=KOLAB_SERVER-$(CURRENT_VERSION)
 
-
 .PHONY: update
 update: current
 
-.PHONY: clean-update
-clean-update:
-	rm -rf update
-
 .PHONY:current
 current: $(KOLAB_SERVER_CVS)
 
 .PHONY:$(KOLAB_SERVER_CVS)
-$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.3
-	@mkdir -p update
-	@for UPDATE in $(UPDATES_2.2.3_2.2.4);                       \
-	do                                                           \
-	  if [ "x`echo $$UPDATE | grep http://`" == "x" ]; then      \
-	    make -C $$UPDATE install || exit $$?;                    \
-	  else                                                       \
-	    TARGET=`echo $${UPDATE} | sed -e 's#.*/\([^/]*\).src.rpm@.*#\1.$(PLATTAG).rpm#'`; \
-	    PACKAGE=`echo $${UPDATE} | sed -e 's#\([^@]*\)@.*#\1#'`; \
-	    if [ ! -e update/$$TARGET ]; then                        \
-	      OPTIONS=`echo $${UPDATE} | sed -e 's#.*@\([^@]*\)#\1#' | sed -e "s#\([^,]*\),\?#--define '\1 yes' #g"`; \
-	      LOCAL=`echo $${UPDATE} | sed -e 's#.*/\([^/]*\).src.rpm@.*#\1.src.rpm#'`; \
-	      cd update; wget -c $$PACKAGE; echo "openpkg rpm --rebuild $$OPTIONS $$LOCAL" | sh;\
-	      cp /kolab/RPM/PKG/$$TARGET .;                          \
-	      /kolab/bin/openpkg rpm -Uhv --force $$TARGET;          \
-	      cd ..;                                                 \
-	    fi;                                                      \
-	  fi;                                                        \
-	done
-	@for UPDATE in kolab-webadmin perl-kolab Kolab_Format kolab-webclient; \
-	do                                                           \
-	  echo "Please build $$UPDATE manually and install it via 'openpkg rpm'"; \
-	done
-
-ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.3"
-.PHONY:KOLAB_SERVER-2.2.3
-KOLAB_SERVER-2.2.3:
-	@echo "You are using Kolab Server 2.2.3. Updating from there..."
-else
-.PHONY:KOLAB_SERVER-2.2.3
-KOLAB_SERVER-2.2.3: KOLAB_SERVER-2.2.2
-	@echo "You are using Kolab Server 2.2.3. Updating from there..."
-	for UPDATE in $(UPDATES_2.2.2_2.2.3);   \
+$(KOLAB_SERVER_CVS): KOLAB_SERVER-2.2.4
+	for UPDATE in $(UPDATES_2.2.4_2.2.5);   \
 	do                                      \
 	  make -C $$UPDATE install || exit $$?; \
 	done
-endif
 
-ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.2"
-.PHONY:KOLAB_SERVER-2.2.2
-KOLAB_SERVER-2.2.2:
-	@echo "You are using Kolab Server 2.2.2. Updating from there..."
+ifeq "x$(KOLAB_SERVER_CURRENT)" "xKOLAB_SERVER-2.2.4"
+.PHONY:KOLAB_SERVER-2.2.4
+KOLAB_SERVER-2.2.4:
+	@echo "You are using Kolab Server 2.2.4. Updating from there..."
 else
-.PHONY:KOLAB_SERVER-2.2.2
-KOLAB_SERVER-2.2.2:
+.PHONY:KOLAB_SERVER-2.2.4
+KOLAB_SERVER-2.2.4:
 	@echo "You are using Kolab Server $(CURRENT_VERSION)."
-	@echo "The update operation is not supported for server versions below 2.2.2"
+	@echo "The update operation is not supported for server versions below 2.2.4"
 	@exit 1
 endif