thomas: server/kolab-webclient Makefile,1.4,1.5

cvs at kolab.org cvs at kolab.org
Thu Nov 20 18:47:00 CET 2008


Author: thomas

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

Modified Files:
	Makefile 
Log Message:
Fix kolab/issue3258 (Building kolab-webclient from CVS fails)

wget -c creates a corrupted file if there already is an old version of the
file. Additionally taking the file from the checkout is better than
downloading it from viewcvs since you compile what you have checked out
instead of something else.


Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-webclient/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile	20 Sep 2008 08:27:58 -0000	1.4
+++ Makefile	20 Nov 2008 17:46:57 -0000	1.5
@@ -24,7 +24,7 @@
 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}
 
-PATCHES = http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch
+PATCHES = ../patches/horde-webmail/$(VERSION)/horde-webmail-$(VERSION)_kolab_openpkg.patch
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
 
@@ -51,8 +51,8 @@
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)" && wget -c "$(SOURCE_1)"
 
-	cd $(KOLABRPMSRC)/$(PACKAGE) && for PATCH in $(PATCHES); do \
-	  wget -c "$$PATCH"; done
+	for PATCH in $(PATCHES); do \
+	  cp "$$PATCH" $(KOLABRPMSRC)/$(PACKAGE); done
 
 	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 





More information about the commits mailing list