gunnar: server/sqlite Makefile,1.2,1.3

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/sqlite
In directory doto:/tmp/cvs-serv2655/sqlite

Modified Files:
	Makefile 
Log Message:
Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit).

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/sqlite/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile	27 Oct 2008 17:21:39 -0000	1.2
+++ Makefile	17 Jan 2010 13:22:55 -0000	1.3
@@ -1,46 +1,31 @@
-NAME = sqlite
-PACKAGE = $(NAME)
-VERSION3 = $(shell grep "define *V_v3" sqlite.spec | sed -e "s/.*V_v3\s*\([0-9.]*\).*/\1/")
+include ../make-helper/kolab.mk
+
+PACKAGE = sqlite
+VERSION = $(shell grep "define *V_v3" sqlite.spec | sed -e "s/.*V_v3\s*\([0-9.]*\).*/\1/")
 VERSION2 = $(shell grep "define *V_v2" sqlite.spec | sed -e "s/.*V_v2\s*\([0-9.]*\).*/\1/")
 RELEASE = $(shell grep "^Release:" sqlite.spec | sed -e "s/^Release:\s*\([0-9]*\).*/\1/")
 KOLABRELEASE = $(RELEASE)
 
-ifeq "x$(RPM)" "x"
-  RPM = $(HOME)/bin/openpkg rpm
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
-  KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
-  KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABRPMTMP)" "x"
-  KOLABRPMTMP = $(HOME)/RPM/TMP
-endif
+SOURCE_URL = http://www.sqlite.org
+SOURCE_0 = sqlite-$(VERSION2).tar.gz
+SOURCE_1 = sqlite-$(VERSION).tar.gz
 
-SOURCE_0=http://www.sqlite.org/sqlite-$(VERSION2).tar.gz
-SOURCE_1=http://www.sqlite.org/sqlite-$(VERSION3).tar.gz
+SOURCES=$(SOURCE_0) $(SOURCE_1)
+RPM_SOURCES = $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1)
 
-.PHONY: all
-all: $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm
+EXTRA = sqlite.patch.v2 sqlite.patch.v3
 
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm ../stage/
+BUILD_OPTIONS =
 
-.PHONY: clean
-clean:
-	rm -rf $(KOLABRPMTMP)/$(NAME)*
-	rm -rf $(KOLABRPMTMP)/$(PACKAGE)
-	rm -rf $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm
-	rm -rf *~
+# Target for retrieving the second source package
+$(SOURCE_1):
+	wget -c "$(SOURCE_URL)/$(SOURCE_1)"
 
-$(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec
-	test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_0)"
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget -c "$(SOURCE_1)"
+# Target for the source file in the src rpm directory.
+$(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1): $(KOLABRPMSRC)/$(PACKAGE) $(SOURCE_1)
+	cp $(SOURCE_1) $(KOLABRPMSRC)/$(PACKAGE)/
 
-	cp $(PACKAGE).spec $(PACKAGE).patch.* $(KOLABRPMSRC)/$(PACKAGE)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec --define 'with_pth no'
 
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm .
+include ../make-helper/package.mk
+include ../make-helper/package-new.mk
+include ../make-helper/fetch.mk