gunnar: server/horde/fbview-horde Makefile, 1.2, 1.3 fbview-horde.spec, 1.11, 1.12

[cvs at kolab.org]

Author: gunnar

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

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

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	2 Aug 2007 10:35:19 -0000	1.2
+++ Makefile	1 Oct 2007 15:47:19 -0000	1.3
@@ -19,15 +19,16 @@
 DATE = ${YEAR}-${MONTH}-${DAY}
 
 PACKAGE = fbview-$(HORDE_NAME)
-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: fbview-horde.spec
===================================================================
RCS file: /kolabrepository/server/horde/fbview-horde/fbview-horde.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- fbview-horde.spec	13 Sep 2007 13:43:54 -0000	1.11
+++ fbview-horde.spec	1 Oct 2007 15:47:19 -0000	1.12
@@ -2,9 +2,10 @@
 %define         V_horde_name horde
 %define         V_package fbview-%{V_horde_name}
 %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:        fbview-horde-conf.template
 Source2:        hooks.php
 Source3:        conf.php
@@ -60,7 +61,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/fbview
 	%{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/fbview/
+	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/fbview/
+
+	cd ..
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} \
 	  $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates