gunnar: server/horde-framework Makefile, 1.1, 1.2 horde-framework-kolab.spec, 1.1, 1.2

cvs at kolab.org cvs at kolab.org
Fri May 25 11:25:22 CEST 2007


Author: gunnar

Update of /kolabrepository/server/horde-framework
In directory doto:/tmp/cvs-serv14244

Modified Files:
	Makefile horde-framework-kolab.spec 
Log Message:
Fixed the draft version of the horde-framework package definition. This should build.

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/horde-framework/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile	25 May 2007 09:11:12 -0000	1.1
+++ Makefile	25 May 2007 09:25:20 -0000	1.2
@@ -1,14 +1,14 @@
 RPM = /kolab/bin/openpkg rpm
-HORDE_NAME = $(shell grep "%define.*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
-YEAR = $(shell grep "%define.*V_year" *.spec | sed -e "s/.*V_year \([a-z-]*\).*/\1/")
-MONTH = $(shell grep "%define.*V_month" *.spec | sed -e "s/.*V_month \([a-z-]*\).*/\1/")
-DAY = $(shell grep "%define.*V_day" *.spec | sed -e "s/.*V_day \([a-z-]*\).*/\1/")
+HORDE_NAME = $(shell grep "%define[ ]*V_horde_name" *.spec | sed -e "s/.*V_horde_name \([a-z-]*\).*/\1/")
+YEAR = $(shell grep "%define[ ]*V_year" *.spec | sed -e "s/.*V_year\s*\([0-9]*\).*/\1/")
+MONTH = $(shell grep "%define[ ]*V_month" *.spec | sed -e "s/.*V_month\s*\([0-9]*\).*/\1/")
+DAY = $(shell grep "%define[ ]*V_day" *.spec | sed -e "s/.*V_day\s*\([0-9]*\).*/\1/")
 
 DATE = ${YEAR}-${MONTH}-${DAY}
 
 PACKAGE = horde-$(HORDE_NAME)-kolab
 VERSION = ${YEAR}${MONTH}${DAY}
-RELEASE = $(shell grep "%define.*V_release" *.spec | sed -e "s/.*V_release \([0-9]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 
 TEMPLATES = $(shell find . -name "*.template")
 CONFIGS = $(shell find . -name "*.php")
@@ -25,6 +25,7 @@
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
+	cp *.patch $(KOLABRPMSRC)/$(PACKAGE)
 	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 
 	if [ -n "$(TEMPLATES)" ]; then              \

Index: horde-framework-kolab.spec
===================================================================
RCS file: /kolabrepository/server/horde-framework/horde-framework-kolab.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- horde-framework-kolab.spec	25 May 2007 09:11:12 -0000	1.1
+++ horde-framework-kolab.spec	25 May 2007 09:25:20 -0000	1.2
@@ -63,7 +63,7 @@
 	rm -rf %{l_prefix}/.pearrc
 
 	for PKG in **/package.xml; do                                                              \
-           if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "devtools/package.xml" -a "$PKG" != "Lens/package.xml" ]; then        \
+           if [ "$PKG" != "Rampage/package.xml" -a "$PKG" != "Text_Textile/package.xml" -a "$PKG" != "Lens/package.xml" ]; then        \
 	        env PHP_PEAR_PHP_BIN="%{l_prefix}/bin/php -d safe_mode=off -d memory_limit=40M"    \
                     PHP_PEAR_CACHE_DIR="/kolab/RPM/TMP/pear/cache"                                 \
                     %{l_prefix}/bin/pear package $PKG;                                             \





More information about the commits mailing list