gunnar: server/horde/horde Makefile, 1.13, 1.14 horde-kolab.spec, 1.16, 1.17

[cvs at kolab.org]

Author: gunnar

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

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

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Makefile	3 Aug 2007 07:38:08 -0000	1.13
+++ Makefile	1 Oct 2007 15:47:19 -0000	1.14
@@ -19,15 +19,16 @@
 DATE = ${YEAR}-${MONTH}-${DAY}
 
 PACKAGE = $(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/")
+UVER = $(shell grep "%define[ ]*V_uver" *.spec | sed -e "s/.*V_uver\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_NAME)-$(UVER).tar.gz
+SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: horde-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde/horde-kolab.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- horde-kolab.spec	13 Sep 2007 13:43:54 -0000	1.16
+++ horde-kolab.spec	1 Oct 2007 15:47:19 -0000	1.17
@@ -2,9 +2,10 @@
 %define         V_horde_name horde
 %define         V_package %{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_uver    3.2-alpha
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
 
@@ -21,7 +22,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source0:	http://ftp.horde.org/pub/snaps/%{V_date}/%{V_horde_name}-HEAD-%{V_date}.tar.gz
+Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_uver}.tar.gz
 Source1:        horde-kolab-conf.template
 Source2:        hooks.php
 Source3:        conf.php
@@ -61,7 +62,7 @@
 detection, user help, and more.
 
 %prep
-	%setup -c -q
+	%setup -c -q -n %{V_horde_name}-%{V_uver}
 
 %build
 
@@ -71,8 +72,15 @@
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
-	cd horde/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
-	cp -r horde $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www
+	cd %{V_horde_name}-%{V_uver}
+
+	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+
+	rm -rf lib/{File,File.php,Horde,Horde.php,Net,SyncML,SyncML.php,Text,VFS,VFS.php,XML}
+
+	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
+
+	cd ..
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates