steffen: server/kolab-resource-handlers Makefile, 1.9, 1.9.2.1 kolab-resource-handlers.spec, 1.126.2.11, 1.126.2.12

[cvs at intevation.de]

Author: steffen

Update of /kolabrepository/server/kolab-resource-handlers
In directory doto:/tmp/cvs-serv7171

Modified Files:
      Tag: kolab_2_0_branch
	Makefile kolab-resource-handlers.spec 
Log Message:
Fix for issue973 (rewritten From header)

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/Makefile,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -d -r1.9 -r1.9.2.1
--- Makefile	4 Nov 2004 12:31:07 -0000	1.9
+++ Makefile	11 Jan 2006 04:38:01 -0000	1.9.2.1
@@ -1,13 +1,20 @@
-RPM = /kolab/bin/openpkg rpm
-VERSION = 0.3.9
-PEARVERSION = 1.3
 ifeq "x$(KOLABRPMSRC)" "x"
   KOLABRPMSRC = /kolab/RPM/SRC
 endif
 
+PACKAGE=kolab-resource-handlers
+VERSION = 0.3.9
+RELEASE=20060111
+PEARVERSION = 1.3
+
+RPM = /kolab/bin/openpkg rpm
+
 all:
-	test -d $(KOLABRPMSRC)/kolab-resource-handlers || mkdir $(KOLABRPMSRC)/kolab-resource-handlers
-	tar -cvj --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/kolab-resource-handlers/kolab-resource-handlers-$(VERSION).tar.bz2 *
-	cp kolab-resource-handlers.spec $(KOLABRPMSRC)/kolab-resource-handlers/
-	cd $(KOLABRPMSRC)/kolab-resource-handlers && wget -c "ftp://ftp.horde.org/pub/pear/pear-$(PEARVERSION).tar.bz2"
-	cd $(KOLABRPMSRC)/kolab-resource-handlers && $(RPM) -ba kolab-resource-handlers.spec
+	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
+	tar -cvj --exclude=CVS --exclude=\*~ -f $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE)-$(VERSION).tar.bz2 *
+	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "ftp://ftp.horde.org/pub/pear/pear-$(PEARVERSION).tar.bz2"
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+dist: all
+	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/

Index: kolab-resource-handlers.spec
===================================================================
RCS file: /kolabrepository/server/kolab-resource-handlers/kolab-resource-handlers.spec,v
retrieving revision 1.126.2.11
retrieving revision 1.126.2.12
diff -u -d -r1.126.2.11 -r1.126.2.12
--- kolab-resource-handlers.spec	22 Dec 2005 17:48:19 -0000	1.126.2.11
+++ kolab-resource-handlers.spec	11 Jan 2006 04:38:01 -0000	1.126.2.12
@@ -8,7 +8,7 @@
 URL:		http://www.kolab.org/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
 Version:	%{V_kolab_reshndl}
-Release:	20051222
+Release:	20060111
 Class:		JUNK
 License:	GPL
 Group:		MAIL