gunnar: server/pear Pear.mk,1.3,1.4

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/pear
In directory doto:/tmp/cvs-serv18482

Modified Files:
	Pear.mk 
Log Message:
Allow to indicate the we want to build with the chroot option by the presence of a file. Split the generation of source and binary rpms.

Index: Pear.mk
===================================================================
RCS file: /kolabrepository/server/pear/Pear.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Pear.mk	23 Jun 2009 14:56:37 -0000	1.3
+++ Pear.mk	25 Jun 2009 08:04:30 -0000	1.4
@@ -54,6 +54,12 @@
 ALTERNATE_MAINTAINER= $(shell grep "^alternate_maintainer=" package.info | sed -e "s/alternate_maintainer='\(.*\)'$$/\1/")
 ALTERNATE_MAINTAINER_SNIPPET= $(shell grep "^alternate_maintainer_snippet=" package.info | sed -e "s/alternate_maintainer_snippet='\(.*\)'$$/\1/")
 
+# Allow to set the with_chroot option
+WITH_CHROOT = $(shell test -e ../.opt.chroot && echo "-D 'with_chroot yes'")
+
+# RPM options
+RPM_OPTIONS = $(WITH_CHROOT)
+
 # Set the default package file end
 ifeq "x$(FILEEND)" "x"
   FILEEND=tgz
@@ -247,12 +253,19 @@
 	  $(PACKAGE).spec
 
 # Target for preparing the source area and building the package
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
+$(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec: Makefile $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0)
 	cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
+
+# Target for building the binary package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(RPM_OPTIONS) $(PACKAGE).spec
+
+# Target for building the source package
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(RPM_OPTIONS) $(PACKAGE).spec
 
 # Target for fetching the source rpm into the current directory
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
 	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
 
 # Target for cleaning up the files that can be generated with this Makefile