gunnar: server/kolab-webclient Makefile, 1.1, 1.2 kolab-webclient.spec, 1.2, 1.3

cvs at kolab.org cvs at kolab.org
Tue Sep 16 16:26:12 CEST 2008


Author: gunnar

Update of /kolabrepository/server/kolab-webclient
In directory doto:/tmp/cvs-serv8748

Modified Files:
	Makefile kolab-webclient.spec 
Log Message:
Update to horde-webmail-1.2_rc1.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	11 Aug 2008 13:57:04 -0000	1.1
+++ Makefile	16 Sep 2008 14:26:10 -0000	1.2
@@ -20,6 +20,7 @@
 
 PACKAGE = $(shell grep "%define[ ]*V_package" *.spec | sed -e "s/.*V_package \([a-z-]*\).*/\1/")
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9._a-z]*\).*/\1/")
+SOURCE_VERSION = $(shell grep "%define[ ]*V_source_version" *.spec | sed -e "s/.*V_source_version\s*\([0-9._a-z-]*\).*/\1/")
 PASSWD_VERSION = $(shell grep "%define[ ]*V_passwd_version" *.spec | sed -e "s/.*V_passwd_version\s*\([0-9._a-z]*\).*/\1/")
 RELEASE = ${YEAR}${MONTH}${DAY}
 
@@ -27,7 +28,7 @@
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
-PACKAGE_0=$(HORDE_NAME)-$(VERSION).tar.gz
+PACKAGE_0=$(HORDE_NAME)-$(SOURCE_VERSION).tar.gz
 SOURCE_0=http://ftp.horde.org/pub/$(HORDE_NAME)/$(PACKAGE_0)
 
 PACKAGE_1=passwd-h3-$(PASSWD_VERSION).tar.gz

Index: kolab-webclient.spec
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/kolab-webclient.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- kolab-webclient.spec	18 Aug 2008 08:28:21 -0000	1.2
+++ kolab-webclient.spec	16 Sep 2008 14:26:10 -0000	1.3
@@ -4,7 +4,8 @@
 %define         V_year  2008
 %define         V_month 08
 %define         V_day   11
-%define         V_version 1.1.1
+%define         V_version 1.2.0
+%define         V_source_version 1.2-rc1
 %define         V_passwd_version 3.0.1
 %define         V_date %{V_year}-%{V_month}-%{V_day}
 %define         V_release %{V_year}%{V_month}%{V_day}
@@ -22,7 +23,7 @@
 Distribution:	OpenPKG
 
 # List of Sources
-Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_version}.tar.gz
+Source0:	http://ftp.horde.org/pub/%{V_horde_name}/%{V_horde_name}-%{V_source_version}.tar.gz
 Source1:        http://ftp.horde.org/pub/passwd/passwd-h3-%{V_passwd_version}.tar.gz
 Source2:        webclient-kolab-conf.template
 Source3:        webclient-kronolith-kolab-conf.template
@@ -48,11 +49,11 @@
 frontend to the Kolab server. The package is based on Horde.
 
 %prep
-	%setup -q -c %{V_horde_name}-%{V_version}
+	%setup -q -c %{V_horde_name}-%{V_source_version}
 	%setup -T -D -a 1
-	mv passwd-h3-%{V_passwd_version} %{V_horde_name}-%{V_version}/passwd
+	mv passwd-h3-%{V_passwd_version} %{V_horde_name}-%{V_source_version}/passwd
 
-	cd %{V_horde_name}-%{V_version}
+	cd %{V_horde_name}-%{V_source_version}
 	%patch -p1 -P 0
 	cd ..
 
@@ -65,7 +66,7 @@
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/var/kolab/storage
 	%{l_shtool} install -d $RPM_BUILD_ROOT%{l_prefix}/etc/kolab/templates	
 
-	cd %{V_horde_name}-%{V_version}
+	cd %{V_horde_name}-%{V_source_version}
 
 	find . -name 'test.php' | xargs rm
 
@@ -99,7 +100,7 @@
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/tmp \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage \
             %dir '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/storage/horde.db \
-	    '%Defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php \
+	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/config/conf.php \
 	    '%defattr(-,%{l_nusr},%{l_ngrp})' %{l_prefix}/var/kolab/www/client/**/config/conf.php
 
 %clean





More information about the commits mailing list