gunnar: server/horde/horde-ingo Makefile, 1.5, 1.6 horde-ingo-kolab.spec, 1.13, 1.14

cvs at kolab.org cvs at kolab.org
Mon Oct 1 17:47:22 CEST 2007


Author: gunnar

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

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

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	3 Aug 2007 07:38:08 -0000	1.5
+++ Makefile	1 Oct 2007 15:47:19 -0000	1.6
@@ -19,15 +19,16 @@
 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/")
+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)-h3-$(UVER).tar.gz
+SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)
 
 .PHONY: all
 all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: horde-ingo-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde/horde-ingo/horde-ingo-kolab.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- horde-ingo-kolab.spec	13 Sep 2007 13:43:54 -0000	1.13
+++ horde-ingo-kolab.spec	1 Oct 2007 15:47:19 -0000	1.14
@@ -2,9 +2,10 @@
 %define         V_horde_name ingo
 %define         V_package horde-%{V_horde_name}-kolab
 %define         V_year  2007
-%define         V_month 09
-%define         V_day   12
-%define         V_version 1.1.3.99
+%define         V_month 10
+%define         V_day   01
+%define         V_version 1.2_alpha
+%define         V_uver    1.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}-h3-%{V_uver}.tar.gz
 Source1:        conf.php
 Source2:        backends.php
 
@@ -49,7 +50,7 @@
 filtering agent in IMP H3 (4.x).
 
 %prep
-	%setup -c -q
+	%setup -c -q -n %{V_horde_name}-h3-%{V_uver}
 
 %build
 
@@ -57,9 +58,13 @@
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
-	cd %{V_horde_name}/config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ../..
+	cd %{V_horde_name}-h3-%{V_uver}
 
-	cp -r %{V_horde_name} $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/
+	cd config && for fl in *.dist;do cp $fl ${fl/.dist/};done; cd ..
+
+	cp -r * $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/
+
+	cd ..
 
 	%{l_shtool} install -c -m 644 %{l_value -s -a} %{S:1} %{S:2} \
 	  $RPM_BUILD_ROOT%{l_prefix}/var/kolab/www/horde/%{V_horde_name}/config/





More information about the commits mailing list