summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Wrobel <wrobel@pardus.de>2010-01-17 13:22:55 (GMT)
committerGunnar Wrobel <wrobel@pardus.de>2010-01-17 13:22:55 (GMT)
commit4f2136760b4dde98067ebd27a93729fff7b24b7b (patch)
tree19b33ed1b9c4e4e36363113422ee570dbae10336
parent75d2b1ca033e479e849f68238cacac8379520454 (diff)
downloadserver-4f2136760b4dde98067ebd27a93729fff7b24b7b.tar.gz
Add fetch target. Convert perl-ldap and sqlite to new build pattern. Added with_tokenizer to the php packages (useful for PHPUnit).
-rw-r--r--apache-php/Makefile3
-rw-r--r--clamav/Makefile1
-rw-r--r--db/Makefile1
-rw-r--r--gmp/Makefile1
-rw-r--r--imapd/Makefile1
-rw-r--r--openldap/Makefile1
-rw-r--r--openpkg/Makefile1
-rw-r--r--perl-ldap/Makefile37
-rw-r--r--php-smarty/Makefile1
-rw-r--r--php/Makefile3
-rw-r--r--postfix/Makefile41
-rw-r--r--sqlite/Makefile69
12 files changed, 58 insertions, 102 deletions
diff --git a/apache-php/Makefile b/apache-php/Makefile
index a9c696e..3308071 100644
--- a/apache-php/Makefile
+++ b/apache-php/Makefile
@@ -22,7 +22,8 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \
--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
- --define 'with_json yes'
+ --define 'with_json yes' --define 'with_tokenizer yes'
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
+include ../make-helper/fetch.mk
diff --git a/clamav/Makefile b/clamav/Makefile
index f848053..b3c8d9c 100644
--- a/clamav/Makefile
+++ b/clamav/Makefile
@@ -10,3 +10,4 @@ EXTRA=clamav.patch rc.clamav
include ../make-helper/package.mk
include ../make-helper/package-new.mk
+include ../make-helper/fetch.mk
diff --git a/db/Makefile b/db/Makefile
index f0c7c05..d80719a 100644
--- a/db/Makefile
+++ b/db/Makefile
@@ -19,3 +19,4 @@ BUILD_OPTIONS=
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
+include ../make-helper/fetch.mk
diff --git a/gmp/Makefile b/gmp/Makefile
index 1e235ba..260bc74 100644
--- a/gmp/Makefile
+++ b/gmp/Makefile
@@ -19,3 +19,4 @@ BUILD_OPTIONS=
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
+include ../make-helper/fetch.mk
diff --git a/imapd/Makefile b/imapd/Makefile
index 3e553b0..36c2e25 100644
--- a/imapd/Makefile
+++ b/imapd/Makefile
@@ -22,3 +22,4 @@ BUILD_OPTIONS=--define 'with_fsl yes' --define 'with_group yes' --define 'with_g
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
+include ../make-helper/fetch.mk
diff --git a/openldap/Makefile b/openldap/Makefile
index e4f2601..98ef802 100644
--- a/openldap/Makefile
+++ b/openldap/Makefile
@@ -12,3 +12,4 @@ BUILD_OPTIONS=--define 'with_pth no'
include ../make-helper/package.mk
include ../make-helper/package-new.mk
+include ../make-helper/fetch.mk
diff --git a/openpkg/Makefile b/openpkg/Makefile
index 5a99ef2..8398803 100644
--- a/openpkg/Makefile
+++ b/openpkg/Makefile
@@ -24,6 +24,7 @@ RELEASETARGET=$(PACKAGE)-$(VERSION)-$(RELEASE).src.sh
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
+include ../make-helper/fetch.mk
$(KOLABRPMPKG)/$(RELEASETARGET): $(KOLABRPMSRC)/$(PACKAGE)/$(PACKAGE).spec.patched $(PACKAGE2)-$(VERSION2)-$(RELEASE2).src.rpm
cd $(KOLABRPMSRC)/$(PACKAGE) && rm $(PACKAGE2)-*.tar.gz && ./openpkg.boot -s
diff --git a/perl-ldap/Makefile b/perl-ldap/Makefile
index cd97cc6..1718612 100644
--- a/perl-ldap/Makefile
+++ b/perl-ldap/Makefile
@@ -1,37 +1,16 @@
-include ../Base.mk
+include ../make-helper/kolab.mk
-NAME = perl-ldap
-PACKAGE = $(NAME)
+PACKAGE = perl-ldap
PKGVER = $(shell grep "%define[ ]*V_perl_" *.spec | sed -e "s/.*V_perl_[a-z]*\s*\([0-9.]*\).*/\1/")
VERSION = $(shell grep "%define[ ]*V_perl " *.spec | sed -e "s/.*V_perl \s*\([0-9.]*\).*/\1/")
RELEASE = $(shell grep "^Release:" *.spec | sed -e "s/^Release:\s*\([0-9a-z_]*\).*/\1/")
-SOURCE_0=rsync://rsync.kolab.org/kolab/server/development-2.2/externals/$(NAME)-$(PKGVER).tar.gz
+SOURCE_URL=http://files.kolab.org/server/development-2.2/externals
+SOURCE_0=$(PACKAGE)-$(PKGVER).tar.gz
EXTRA=cookie_parsing_error.patch sync_refresh_required.patch
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+BUILD_OPTIONS=
-.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 *~
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm: Makefile $(PACKAGE).spec $(EXTRA)
- test -d $(KOLABRPMSRC)/$(PACKAGE) || mkdir $(KOLABRPMSRC)/$(PACKAGE)
- rsync -tvz "$(SOURCE_0)" $(KOLABRPMSRC)/$(PACKAGE)/
-
- cp $(PACKAGE).spec $(EXTRA) $(KOLABRPMSRC)/$(PACKAGE)
- cd $(KOLABRPMSRC)/$(PACKAGE) && $(RPM) -ba $(PACKAGE).spec
-
- cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm .
-
-.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
- $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(RELEASE).$(PLATTAG).rpm
+include ../make-helper/package.mk
+include ../make-helper/package-new.mk
+include ../make-helper/fetch.mk
diff --git a/php-smarty/Makefile b/php-smarty/Makefile
index e784a8e..8a00523 100644
--- a/php-smarty/Makefile
+++ b/php-smarty/Makefile
@@ -12,3 +12,4 @@ BUILD_OPTIONS=
include ../make-helper/package.mk
include ../make-helper/package-new.mk
+include ../make-helper/fetch.mk
diff --git a/php/Makefile b/php/Makefile
index 87ac988..c7203f4 100644
--- a/php/Makefile
+++ b/php/Makefile
@@ -22,7 +22,8 @@ BUILD_OPTIONS=--define 'with_imap_annotate yes' --define 'with_imap_myrights yes
--define 'with_openldap yes' --define 'with_hash yes' --define 'with_zlib yes' \
--define 'with_bdb yes' --define 'with_xml yes' --define 'with_mm yes' \
--define 'with_sqlite yes' --define 'with_spl yes' --define 'with_hash yes' \
- --define 'with_json yes'
+ --define 'with_json yes' --define 'with_tokenizer yes'
include ../make-helper/package.mk
include ../make-helper/openpkg-patched.mk
+include ../make-helper/fetch.mk
diff --git a/postfix/Makefile b/postfix/Makefile
index aeb8a7b..61a9c12 100644
--- a/postfix/Makefile
+++ b/postfix/Makefile
@@ -1,37 +1,20 @@
-ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = http://files.kolab.org/server/development-2.2/openpkg-orig-srpms/
-endif
-ifeq "x$(KOLABRPMSRC)" "x"
- KOLABRPMSRC = $(HOME)/RPM/SRC
-endif
-ifeq "x$(KOLABRPMPKG)" "x"
- KOLABRPMPKG = $(HOME)/RPM/PKG
-endif
-ifeq "x$(KOLABCVSDIR)" "x"
- KOLABCVSDIR = $(CURDIR)
-endif
-ifeq "x$(RPM)" "x"
- RPM = $(HOME)/bin/openpkg rpm
-endif
+include ../make-helper/kolab.mk
PACKAGE=postfix
+DOWNLOAD_VERSION=2.4.6
+OPENPKG_RELEASE=20080101
VERSION=2.4.6
-RELEASE=20080101
-KOLABRELEASE=20080101_kolab
+RELEASE=20080101_kolab
-all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+SOURCE_URL=
+SOURCE_0=
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch Makefile
- $(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+PATCHES=
- cd $(KOLABRPMSRC)/$(PACKAGE) && patch < $(KOLABCVSDIR)/kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes'
- cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm $(KOLABCVSDIR)
+EXTRA=kolab.patch
-$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
- wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+BUILD_OPTIONS=--define 'with_fsl yes' --define 'with_ssl yes' --define 'with_sasl yes' --define 'with_ldap yes'
-dist: all
- cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
-
-clean:
- rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+include ../make-helper/package.mk
+include ../make-helper/openpkg-patched.mk
+include ../make-helper/fetch.mk
diff --git a/sqlite/Makefile b/sqlite/Makefile
index c4eb45f..a2350a8 100644
--- a/sqlite/Makefile
+++ b/sqlite/Makefile
@@ -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_0=http://www.sqlite.org/sqlite-$(VERSION2).tar.gz
-SOURCE_1=http://www.sqlite.org/sqlite-$(VERSION3).tar.gz
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm
-
-.PHONY: dist
-dist: all
- cp $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm ../stage/
-
-.PHONY: clean
-clean:
- rm -rf $(KOLABRPMTMP)/$(NAME)*
- rm -rf $(KOLABRPMTMP)/$(PACKAGE)
- rm -rf $(PACKAGE)-$(VERSION3)-$(RELEASE).src.rpm
- rm -rf *~
-
-$(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)"
-
- 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 .
+SOURCE_URL = http://www.sqlite.org
+SOURCE_0 = sqlite-$(VERSION2).tar.gz
+SOURCE_1 = sqlite-$(VERSION).tar.gz
+
+SOURCES=$(SOURCE_0) $(SOURCE_1)
+RPM_SOURCES = $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_0) $(KOLABRPMSRC)/$(PACKAGE)/$(SOURCE_1)
+
+EXTRA = sqlite.patch.v2 sqlite.patch.v3
+
+BUILD_OPTIONS =
+
+# Target for retrieving the second source package
+$(SOURCE_1):
+ wget -c "$(SOURCE_URL)/$(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)/
+
+
+include ../make-helper/package.mk
+include ../make-helper/package-new.mk
+include ../make-helper/fetch.mk