gunnar: server/make-helper package-new.mk, 1.2, 1.3 package.mk, 1.6, 1.7

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/make-helper
In directory doto:/tmp/cvs-serv19825

Modified Files:
	package-new.mk package.mk 
Log Message:
Fix typo. Move EXTRA to the helper actually using it. Include the spec file in out dependencies.

Index: package-new.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/package-new.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- package-new.mk	5 Jan 2010 16:24:55 -0000	1.2
+++ package-new.mk	11 Jan 2010 16:52:43 -0000	1.3
@@ -1,9 +1,11 @@
+EXTRA ?=
+
 # Target for the src rpm directory.
 $(KOLABRPMSRC)/$(PACKAGE):
 	mkdir -p $(KOLABRPMSRC)/$(PACKAGE)
 
 # Target for the src rpm spec file.
-$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) $(EXTRA)
+$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: $(KOLABRPMSRC)/$(PACKAGE) $(PACKAGE).spec $(EXTRA)
 	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
 
 # Target for building the source package

Index: package.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/package.mk,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- package.mk	11 Jan 2010 15:52:12 -0000	1.6
+++ package.mk	11 Jan 2010 16:52:43 -0000	1.7
@@ -1,11 +1,10 @@
 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/")
-RELEASE ?= $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_rekease\s*\([0-9._a-z]*\).*/\1/")
+RELEASE ?= $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9._a-z]*\).*/\1/")
 
 SOURCE_URL ?= 
 SOURCE_FORMAT ?= tar.gz
 SOURCE_0 ?= $(PACKAGE)-$(VERSION).$(SOURCE_FORMAT)
-EXTRA ?=
 
 BUILD_OPTIONS ?=
 
@@ -47,7 +46,6 @@
 # Target for fetching the source rpm into the current directory
 $(RELEASETARGET): $(KOLABRPMPKG)/$(RELEASETARGET)
 	cp $(KOLABRPMPKG)/$(RELEASETARGET) .
-
 
 ifeq ($(SOURCE_0),)
 else