gunnar: server/horde/horde-framework Makefile, 1.8, 1.9 horde-framework-kolab.spec, 1.20, 1.21

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/horde/horde-framework
In directory doto:/tmp/cvs-serv20832/horde/horde-framework

Modified Files:
	Makefile horde-framework-kolab.spec 
Log Message:
Moving the horde packages to the latest ALPHA release.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	3 Aug 2007 11:40:04 -0000	1.8
+++ Makefile	1 Oct 2007 15:47:19 -0000	1.9
@@ -19,15 +19,15 @@
 DATE = ${YEAR}-${MONTH}-${DAY}
 
 PACKAGE = horde-$(HORDE_NAME)-kolab
-VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._A-Z]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
 PATCHES = $(shell find . -name "*.patch")
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
-PACKAGE_0=$(HORDE_NAME)-HEAD-$(DATE).tar.gz
-SOURCE_0=http://ftp.horde.org/pub/snaps/${DATE}/$(PACKAGE_0)
+PACKAGE_0=horde-$(HORDE_NAME)-$(VERSION).tar.bz2
+SOURCE_0=http://build.pardus.de/downloads/$(PACKAGE_0)
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- horde-framework-kolab.spec	13 Sep 2007 13:50:55 -0000	1.20
+++ horde-framework-kolab.spec	1 Oct 2007 15:47:19 -0000	1.21
@@ -2,9 +2,9 @@
 %define         V_horde_name framework
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
-%define         V_month 09
-%define         V_day   12
-%define         V_version 3.1.4.99
+%define         V_month 10
+%define         V_day   01
+%define         V_version 3.2_ALPHA
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -20,17 +20,13 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source0:	http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
 
-##################################################
-# PATCH COMMENT
-#
-#   Necessary to allow Ingo store the filters
-#   based on the preference driver. Ingo needs
-#   to get fixed to be able to remove this patch.
-#   See Horde bug #5117
-#   http://bugs.horde.org/ticket/?id=5117
-Patch0:         Prefs-Prefs-kolab.php.patch
+# While we download from a non-horde site again this package provides a plain
+# CVS checkout from horde cvs, tagget with HORDE_3.2_ALPHA. Horde sadly does not
+# provide such packages
+Source0:	http://build.pardus.de/downloads/horde-%{V_horde_name}-%{V_version}.tar.bz2
+
+Patch0:         HK-GW-Fix_Prefs_for_Ingo.patch
 
 # Build Info
 Prefix:		%{l_prefix}
@@ -51,7 +47,7 @@
 
 %prep
 	%setup -n framework
-	%patch -p0 -P 0
+	%patch -p2 -P 0
 
 %build