gunnar: server/imapd .cvsignore,1.3,1.4 Makefile,1.45,1.46

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv21324/imapd

Modified Files:
	.cvsignore Makefile 
Log Message:
Reduce a first Makefile to its essential information while moving the functions duplicated in many of the other makefiles into a central helper that can be included. While this makes it less obvious how a single makefile works we only have three or four different package build types. Maintaining these at only one location rather than at twenty different ones seems useful. Especially if we should ever consider switching our base distribution.

Index: .cvsignore
===================================================================
RCS file: /kolabrepository/server/imapd/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- .cvsignore	11 Mar 2008 15:42:19 -0000	1.3
+++ .cvsignore	9 Dec 2009 23:08:07 -0000	1.4
@@ -1 +1,2 @@
 *.src.rpm
+*.tar.gz
\ No newline at end of file

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- Makefile	4 Dec 2009 10:58:01 -0000	1.45
+++ Makefile	9 Dec 2009 23:08:07 -0000	1.46
@@ -1,46 +1,25 @@
-include ../Base.mk
+include ../make-helper/kolab.mk
 
 PACKAGE=imapd
 DOWNLOAD_VERSION=2.3.13
+OPENPKG_RELEASE=20081020
 VERSION=2.3.15
-RELEASE=20081020
-KOLABRELEASE=20081020_kolab5
+RELEASE=20081020_kolab5
 
-SOURCE_0=ftp://ftp.andrew.cmu.edu/pub/cyrus/cyrus-imapd-2.3.15.tar.gz
+SOURCE_URL=ftp://ftp.andrew.cmu.edu/pub/cyrus
+SOURCE_0=cyrus-imapd-2.3.15.tar.gz
 
 PATCHES=patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Cyradm_Annotations.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Folder-names.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
-	patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch \
-	kolab.patch \
-	imapd.patch
-
-.PHONY: all
-all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-
-$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm $(PATCHES) Makefile
-	$(RPM) -ihv $(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
-
-	cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
-
-	cd $(KOLABRPMSRC)/$(PACKAGE) && wget $(SOURCE_0)
-	cd $(KOLABRPMSRC)/$(PACKAGE) && patch < kolab.patch && $(RPM) -ba $(PACKAGE).spec --define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
-	cp -p $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm .
-
-$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm:
-	wget -c $(KOLABPKGURI)/$(PACKAGE)-$(DOWNLOAD_VERSION)-$(RELEASE).src.rpm
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Folder-names.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
+        patches/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch
 
-.PHONY: dist
-dist: all
-	cp $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+EXTRA=$(PATCHES) kolab.patch imapd.patch
 
-.PHONY: clean
-clean:
-	rm -f $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+BUILD_OPTIONS=--define 'with_fsl yes' --define 'with_group yes' --define 'with_group_igncase yes' --define 'with_atvdom yes' --define 'with_drac no' --define 'with_replication no' --define 'with_murder no' --define 'with_listext no' --define 'with_nntp no' --define 'with_ldap yes' --define 'with_annotate yes' --define 'with_morelogging yes' --define 'with_kolab yes' --define 'with_kolab_nocaps yes'
 
-.PHONY: install
-install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
-	$(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+include ../make-helper/package.mk
+include ../make-helper/openpkg-patched.mk