gunnar: server/pear Horde.mk,1.10,1.11

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	Horde.mk 
Log Message:
Added Horde_Util-H4 to CVS and set Horde_Framework-H4 to depend on it.

Index: Horde.mk
===================================================================
RCS file: /kolabrepository/server/pear/Horde.mk,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Horde.mk	26 May 2009 20:05:05 -0000	1.10
+++ Horde.mk	23 Jun 2009 07:56:08 -0000	1.11
@@ -17,7 +17,7 @@
 HORDE_PKGDIR = $(shell grep "%define[ ]*V_horde_pkgdir" *.spec | sed -e "s/.*V_horde_pkgdir \([A-Za-z0-9\-\_]*\)\s*/\1/")
 
 # Determine the horde package name from the *.spec file
-HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z0-9\-\_]*\).*/\1/")
+HORDE_PACKAGE = $(shell grep "%define[ ]*V_horde_package" *.spec | sed -e "s/.*V_horde_package \([A-Za-z0-9\_-]*\).*/\1/")
 
 # Determine the package origin from the *.spec file
 PACKAGE_ORIGIN = $(shell grep "%define[ ]*V_package_origin" *.spec | sed -e "s/.*V_package_origin \([A-Z]*\).*/\1/")
@@ -26,11 +26,14 @@
 PACKAGE_VC = $(shell grep "%define[ ]*V_package_origin" *.spec | sed -e "s/.*V_package_origin [A-Z]*-\([A-Z]*\).*/\1/")
 
 # Determine the package name from the *.spec file
-PACKAGE = $(shell grep "%define[ ]*V_package " *.spec | sed -e "s/.*V_package \([A-Za-z0-9\-\_]*\)\s*/\1/")
+PACKAGE = $(shell grep "%define[ ]*V_package " *.spec | sed -e "s/.*V_package \([A-Za-z0-9\_-]*\)\s*/\1/")
 
 # Determine the package version from the *.spec file
 VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.a-z]*\).*/\1/")
 
+# Determine the file end of the source package
+FILEEND = $(shell grep "%define[ ]*V_pkg_fileend" *.spec | sed -e "s/.*V_pkg_fileend\s*\([0-9.a-z]*\).*/\1/")
+
 # Determine the release number from the *.spec file
 RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
@@ -51,9 +54,13 @@
 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/")
 
+# Set the default package file end
+ifeq "x$(FILEEND)" "x"
+  FILEEND=tgz
+endif
 
 # Generate the full package name
-SOURCE_0=$(HORDE_PACKAGE)-$(VERSION).tgz
+SOURCE_0=$(HORDE_PACKAGE)-$(VERSION).$(FILEEND)
 
 # Get the list of patches if there are any in the patch directory
 PATCHES = $(shell ls patches/$(PACKAGE)-$(VERSION)/*.patch 2> /dev/null)