gunnar: server/make-helper package-new.mk, NONE, 1.1 openpkg-patched.mk, 1.2, 1.3 package.mk, 1.3, 1.4

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	openpkg-patched.mk package.mk 
Added Files:
	package-new.mk 
Log Message:
MFB: kolab/issue3513 (Clamav - new upstream version 0.95.3). In addition the Makefile was adapted to the make helper scripts.

--- NEW FILE: package-new.mk ---
# 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)
	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)

# Target for building the source package
$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec

# Target for building the binary package
$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS)

Index: openpkg-patched.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/openpkg-patched.mk,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openpkg-patched.mk	4 Jan 2010 23:02:19 -0000	1.2
+++ openpkg-patched.mk	5 Jan 2010 12:58:43 -0000	1.3
@@ -27,3 +27,10 @@
 $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec $(BUILD_OPTIONS)
 
+# Prepare the patch for the package.
+package.patch: $(PATCHES)
+	echo > package.patch
+	for PATCH in $(PATCHES);        \
+	do                              \
+	  cat $$PATCH >> package.patch; \
+	done

Index: package.mk
===================================================================
RCS file: /kolabrepository/server/make-helper/package.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- package.mk	5 Jan 2010 11:49:35 -0000	1.3
+++ package.mk	5 Jan 2010 12:58:43 -0000	1.4
@@ -47,14 +47,6 @@
 	wget -c "$(SOURCE_URL)/$(SOURCE_0)"
 endif
 
-# Prepare the patch for the package.
-package.patch: $(PATCHES)
-	echo > package.patch
-	for PATCH in $(PATCHES);        \
-	do                              \
-	  cat $$PATCH >> package.patch; \
-	done
-
 # Prepare the staging area
 $(STAGING):
 	mkdir -p $(STAGING)