gunnar: server/pear Pear.mk,1.4,1.5 pear.spec.template,1.1,1.2

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Pear.mk pear.spec.template 
Log Message:
Solve the with_chroot option via the spec template.

Index: Pear.mk
===================================================================
RCS file: /kolabrepository/server/pear/Pear.mk,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Pear.mk	25 Jun 2009 08:04:30 -0000	1.4
+++ Pear.mk	25 Jun 2009 19:16:00 -0000	1.5
@@ -55,10 +55,7 @@
 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)
+WITH_CHROOT = $(shell if [ -e ../.opt.chroot ]; then echo "yes"; else echo "no"; fi)
 
 # Set the default package file end
 ifeq "x$(FILEEND)" "x"
@@ -249,7 +246,8 @@
 	      -e "s#[@]license[@]#$${license}#g"               \
 	      -e "s#[@]buildprereq[@]#$${buildprereq}#g"       \
 	      -e "s#[@]prereq[@]#$${prereq}#g"                 \
-	      -e "s#[@]description[@]#$${description}#g" >     \
+	      -e "s#[@]description[@]#$${description}#g"       \
+	      -e "s#[@]with_chroot[@]#$(WITH_CHROOT)#g" >      \
 	  $(PACKAGE).spec
 
 # Target for preparing the source area and building the package
@@ -258,11 +256,11 @@
 
 # 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
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(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
+	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -bs $(PACKAGE).spec
 
 # Target for fetching the source rpm into the current directory
 $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm

Index: pear.spec.template
===================================================================
RCS file: /kolabrepository/server/pear/pear.spec.template,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pear.spec.template	23 Jun 2009 14:15:41 -0000	1.1
+++ pear.spec.template	25 Jun 2009 19:16:00 -0000	1.2
@@ -39,7 +39,7 @@
 @prereq@
 
 # Package options
-%option       with_chroot              no
+%option       with_chroot              @with_chroot@
 
 %description 
 @description@