gunnar: server/pear Horde.mk,1.7,1.8

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Horde.mk 
Log Message:
Fix package.xml editing.

Index: Horde.mk
===================================================================
RCS file: /kolabrepository/server/pear/Horde.mk,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Horde.mk	19 May 2009 07:57:54 -0000	1.7
+++ Horde.mk	19 May 2009 08:02:44 -0000	1.8
@@ -44,9 +44,9 @@
 SOURCE_URL=$(shell grep "%define[ ]*V_sourceurl" *.spec | sed -e "s/.*V_sourceurl\s*\(.*\)/\1/")
 
 # Additional variables for tweaking the PEAR package.xml
-ALTERNATE_CHANNEL= $(shell grep "%define[ ]*V_alternate_channel" *.spec | sed -e "s/.*V_alternate_channel\s*\(.*\)/\1/")
-ALTERNATE_MAINTAINER= $(shell grep "%define[ ]*V_alternate_maintainer " *.spec | sed -e "s/.*V_alternate_maintainer\s*\(.*\)/\1/")
-ALTERNATE_MAINTAINER_SNIPPET= $(shell grep "%define[ ]*V_alternate_maintainer_snippet" *.spec | sed -e "s/.*V_alternate_maintainer_snippet\s*\(.*\)/\1/")
+ALTERNATE_CHANNEL= $(shell grep "%define[ ]*V_alternate_channel" *.spec | sed -e "s/.*V_alternate_channel\s*\(.*\)$$/\1/")
+ALTERNATE_MAINTAINER= $(shell grep "%define[ ]*V_alternate_maintainer " *.spec | sed -e "s/.*V_alternate_maintainer\s*\(.*\)$$/\1/")
+ALTERNATE_MAINTAINER_SNIPPET= $(shell grep "%define[ ]*V_alternate_maintainer_snippet" *.spec | sed -e "s/.*V_alternate_maintainer_snippet\s*\(.*\)$$/\1/")
 
 
 # Generate the full package name
@@ -150,7 +150,7 @@
 	sed -i -e "/version/,+1 s#<release>\(.*\)</release>#<release>\1dev$(RELTAG)</release>#" tmp/$(PACKAGE)/package.xml
 	sed -i -e "/lead/,+1 s#<date>.*</date>#<date>$(DATE)</date>#" tmp/$(PACKAGE)/package.xml
 ifneq ($(ALTERNATE_CHANNEL),)
-	sed -i -e 's#<channel>.*</channel>#<channel>$(ALTERNATE_CHANNEL</channel>#' tmp/$(PACKAGE)/package.xml
+	sed -i -e 's#<channel>.*</channel>#<channel>$(ALTERNATE_CHANNEL)</channel>#' tmp/$(PACKAGE)/package.xml
 endif
 ifneq ($(ALTERNATE_MAINTAINER),)
 	if [ -z "`grep $(ALTERNATE_MAINTAINER) tmp/$(PACKAGE)/package.xml`" ]; then \
@@ -158,7 +158,6 @@
 	  sed -i -e '/date.*\/date/ i\ $(ALTERNATE_MAINTAINER_SNIPPET)'  tmp/$(PACKAGE)/package.xml; \
 	fi
 endif
-
 	$(PEAR) package tmp/$(PACKAGE)/package.xml
 	rm -rf tmp
 endif
@@ -168,6 +167,15 @@
 $(SOURCE_0): tmp/$(PACKAGE)
 	sed -i -e "/version/,+1 s#<release>\(.*\)</release>#<release>\1dev$(RELTAG)</release>#" tmp/$(PACKAGE)/package.xml
 	sed -i -e "/lead/,+1 s#<date>.*</date>#<date>$(DATE)</date>#" tmp/$(PACKAGE)/package.xml
+ifneq ($(ALTERNATE_CHANNEL),)
+	sed -i -e 's#<channel>.*</channel>#<channel>$(ALTERNATE_CHANNEL)</channel>#' tmp/$(PACKAGE)/package.xml
+endif
+ifneq ($(ALTERNATE_MAINTAINER),)
+	if [ -z "`grep $(ALTERNATE_MAINTAINER) tmp/$(PACKAGE)/package.xml`" ]; then \
+	  sed -i -e '/lead/,/\/lead/ D'  tmp/$(PACKAGE)/package.xml; \
+	  sed -i -e '/date.*\/date/ i\ $(ALTERNATE_MAINTAINER_SNIPPET)'  tmp/$(PACKAGE)/package.xml; \
+	fi
+endif
 	$(PEAR) package tmp/$(PACKAGE)/package.xml
 	rm -rf tmp
 else