gunnar: server/php-smarty Makefile,1.5,1.6 php-smarty.spec,1.5,1.6

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-smarty
In directory doto:/tmp/cvs-serv22913/php-smarty

Modified Files:
	Makefile php-smarty.spec 
Log Message:
Fix the Makefiles for a possible non-standard development environment (meaning: not located in /kolab).

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-smarty/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile	17 Jul 2007 15:07:15 -0000	1.5
+++ Makefile	27 Jul 2007 10:30:33 -0000	1.6
@@ -1,23 +1,43 @@
-RPM = /kolab/bin/openpkg rpm
 NAME = Smarty
 PACKAGE = php-smarty
-VERSION = 2.6.18
-RELEASE = 20070607
+VERSION = $(shell grep "%define[ ]*V_version" *.spec | sed -e "s/.*V_version\s*\([0-9.]*\).*/\1/")
+RELEASE = $(shell grep "%define[ ]*V_release" *.spec | sed -e "s/.*V_release\s*\([0-9]*\).*/\1/")
 KOLABRELEASE = $(RELEASE)
 
+ifeq "x$(RPM)" "x"
+  RPM = $(HOME)/bin/openpkg rpm
+endif
 ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = /kolab/RPM/SRC
+  KOLABRPMSRC = $(HOME)/RPM/SRC
+endif
+ifeq "x$(KOLABRPMPKG)" "x"
+  KOLABRPMPKG = $(HOME)/RPM/PKG
+endif
+ifeq "x$(KOLABRPMTMP)" "x"
+  KOLABRPMTMP = $(HOME)/RPM/TMP
 endif
 
-all:
+SOURCE_0=http://smarty.php.net/distributions/$(NAME)-$(VERSION).tar.gz
+
+.PHONY: all
+all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+
+.PHONY: dist
+dist: all
+	cp $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm ../stage/
+
+.PHONY: clean
+clean:
+	rm -rf $(KOLABRPMTMP)/$(NAME)*
+	rm -rf $(KOLABRPMTMP)/$(PACKAGE)
+	rm -rf $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+	rm -rf *~
+
+$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec
 	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "http://smarty.php.net/distributions/$(NAME)-$(VERSION).tar.gz" 
+	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
 
 	cp $(PACKAGE).spec $(KOLABRPMSRC)/$(PACKAGE)
 	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
 
-dist: all
-	cp $(KOLABRPMSRC)/../PKG/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
-
-binary:
-	$(RPM) -bB $(PACKAGE).spec
+	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .

Index: php-smarty.spec
===================================================================
RCS file: /kolabrepository/server/php-smarty/php-smarty.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- php-smarty.spec	17 Jul 2007 15:07:15 -0000	1.5
+++ php-smarty.spec	27 Jul 2007 10:30:33 -0000	1.6
@@ -1,14 +1,14 @@
-# Versions
-%define		V_php		5.2.3
-%define		V_Smarty	2.6.18
+# Variables
+%define         V_version       2.6.18
+%define         V_release       20070607
 
 # Package Information
 Name:		php-smarty
 Summary:	Template engine for PHP
 URL:		http://smarty.php.net/
 Packager:	Steffen Hansen <steffen at klaralvdalens-datakonsult.se> (Klaraelvdalens Datakonsult AB)
-Version:	2.6.18
-Release:	20070607
+Version:        %{V_version}
+Release:        %{V_release}
 Class:		JUNK
 License:	LGPL
 Group:		Languages