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

cvs at kolab.org cvs at kolab.org
Tue May 26 22:05:08 CEST 2009


Author: gunnar

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

Modified Files:
	Horde.mk 
Log Message:
Allow numbers in package names.

Index: Horde.mk
===================================================================
RCS file: /kolabrepository/server/pear/Horde.mk,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- Horde.mk	25 May 2009 16:48:37 -0000	1.9
+++ Horde.mk	26 May 2009 20:05:05 -0000	1.10
@@ -14,10 +14,10 @@
 PEAR=$(HOME)/bin/pear
 
 # Determine the horde package name from the *.spec file
-HORDE_PKGDIR = $(shell grep "%define[ ]*V_horde_pkgdir" *.spec | sed -e "s/.*V_horde_pkgdir \([A-Za-z\-\_]*\)\s*/\1/")
+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-z\-\_]*\).*/\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,7 +26,7 @@
 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-z\-\_]*\)\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/")





More information about the commits mailing list