gunnar: server/imapd Makefile,1.38,1.39 kolab.patch,1.38,1.39
cvs at kolab.org
cvs at kolab.org
Sun Jan 25 23:11:13 CET 2009
Author: gunnar
Update of /kolabrepository/server/imapd
In directory doto:/tmp/cvs-serv2490/imapd
Modified Files:
Makefile kolab.patch
Log Message:
kolab/issue3175 (Cyrus IMAPd 2.3.13 Released)
Index: Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- Makefile 20 May 2008 17:13:36 -0000 1.38
+++ Makefile 25 Jan 2009 22:11:11 -0000 1.39
@@ -1,5 +1,6 @@
ifeq "x$(KOLABPKGURI)" "x"
- KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/
+ KOLABPKGURI = http://files.pardus.de/
+# KOLABPKGURI = http://ftp.gwdg.de/pub/linux/kolab/server/development-2.2/openpkg-orig-srpms/
endif
ifeq "x$(KOLABRPMSRC)" "x"
KOLABRPMSRC = $(HOME)/RPM/SRC
@@ -14,18 +15,27 @@
RPM = $(HOME)/bin/openpkg rpm
endif
+ifeq "x$(PLATTAG)" "x"
+ PLATTAG = $(shell $(RPM) -q --qf="%{ARCH}-%{OS}" openpkg)-$(HOME:/%=%)
+endif
+
PACKAGE=imapd
-VERSION=2.3.11
-RELEASE=20080101
-KOLABRELEASE=20080101_kolab4
+VERSION=2.3.13
+RELEASE=20081020
+KOLABRELEASE=20081020_kolab1
-PATCHES=$(KOLABCVSDIR)/timsieved-starttls-sendcaps.patch \
- $(KOLABCVSDIR)/imapd.patch.group \
- $(KOLABCVSDIR)/KOLAB_cyrus-imapd-2.3.12_UID.patch
+PATCHES=../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-cyradm-$(VERSION)_Annotations.patch \
+ ../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Annotations2.patch \
+ ../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Folder-names.patch \
+ ../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Groups2.patch \
+ ../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_Logging.patch \
+ ../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_timsieved_starttls-sendcaps.patch \
+ ../patches/cyrus-imapd/cyrus-imapd-$(VERSION)/KOLAB_cyrus-imapd-$(VERSION)_UID.patch
+.PHONY: all
all: $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
-$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
+$(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm $(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm: $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm $(KOLABCVSDIR)/kolab.patch $(PATCHES) Makefile
$(RPM) -ihv $(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
cp $(PATCHES) $(KOLABRPMSRC)/$(PACKAGE)/
@@ -36,8 +46,14 @@
$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm:
wget -c $(KOLABPKGURI)/$(PACKAGE)-$(VERSION)-$(RELEASE).src.rpm
+.PHONY: dist
dist: all
cp $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm ../stage/
+.PHONY: clean
clean:
rm -f $(KOLABCVSDIR)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).src.rpm
+
+.PHONY: install
+install: $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
+ $(RPM) -Uhv --force $(KOLABRPMPKG)/$(PACKAGE)-$(VERSION)-$(KOLABRELEASE).$(PLATTAG).rpm
Index: kolab.patch
===================================================================
RCS file: /kolabrepository/server/imapd/kolab.patch,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- kolab.patch 8 May 2008 17:33:14 -0000 1.38
+++ kolab.patch 25 Jan 2009 22:11:11 -0000 1.39
@@ -1,11 +1,11 @@
---- imapd.spec.orig 2008-01-01 15:31:56.000000000 +0100
-+++ imapd.spec 2008-04-10 19:23:09.194783000 +0200
+--- imapd.spec.orig 2008-10-20 20:12:23.000000000 +0200
++++ imapd.spec 2009-01-25 22:19:52.000000000 +0100
@@ -32,7 +32,7 @@
Group: Mail
License: BSD
- Version: 2.3.11
--Release: 20080101
-+Release: 20080101_kolab4
+ Version: 2.3.13
+-Release: 20081020
++Release: 20081020_kolab1
# package options
%option with_fsl yes
@@ -17,28 +17,61 @@
# fixing implicit inter-module dependencies and correlations
%if "%{with_kolab}" == "yes"
-@@ -73,6 +74,7 @@
- Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Logging.patch
+@@ -67,12 +68,13 @@
+ Source3: imapd.conf
+ Source4: fsl.imapd
+ Patch0: imapd.patch
+-Patch1: imapd.patch.group
+-Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Annotations2.patch
+-Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-cyradm-2.3.11_Annotations.patch
+-Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Logging.patch
-Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_UID.patch
-+Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.12/KOLAB_cyrus-imapd-2.3.12_UID.patch
- Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
-+Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/imapd/timsieved-starttls-sendcaps.patch
+-Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-2.3.11/KOLAB_cyrus-imapd-2.3.11-_Folder-names.patch
++Patch1: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Groups2.patch
++Patch2: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Annotations2.patch
++Patch3: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-cyradm-%{version}_Annotations.patch
++Patch4: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Logging.patch
++Patch5: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_UID.patch
++Patch6: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_Folder-names.patch
++Patch7: http://kolab.org/cgi-bin/viewcvs-kolab.cgi/*checkout*/server/patches/cyrus-imapd/cyrus-imapd-%{version}/KOLAB_cyrus-imapd-%{version}_timsieved_starttls-sendcaps.patch
# build information
Prefix: %{l_prefix}
-@@ -152,6 +154,11 @@
+@@ -120,11 +122,7 @@
+
+ # add optional group file support with support to ignore case
+ %if "%{with_group}" == "yes"
+- cp %{PATCH imapd.patch.group} imapd.patch.group
+-%if "%{with_group_igncase}" == "yes"
+- %{l_shtool} subst -e 's;^\(\+.*\)strcmp;\1strcasecmp;' imapd.patch.group
+-%endif
+- %{l_patch} -p1 <imapd.patch.group
++ %patch -p1 -P 1
+ %{l_shtool} subst \
+ -e 's;/etc/imapd\.group;%{l_prefix}/etc/imapd/imapd.group;' \
+ lib/auth_unix.c
+@@ -132,7 +130,7 @@
+
+ # add optional folder annotation support
+ %if "%{with_annotate}" == "yes"
+- sed <%{PATCH2} -e '5,27d' | %{l_patch} -p1
++ %patch -p1 -P 2
+ %patch -p1 -P 3
+ %endif
+
+@@ -152,6 +150,11 @@
%patch -p1 -P 6
%endif
+ # kolab/issue2443 (kontact aborts sieve when imapd sends capabilities after starttls)
+%if "%{with_kolab_nocaps}" == "yes"
-+ %patch -p2 -R -P 7
++ %patch -p1 -P 7
+%endif
+
# add optional DRAC file support
%if "%{with_drac}" == "yes"
%{l_shtool} subst -e 's;@DRACLIBS@;-ldrac;g' contrib/drac_auth.patch
-@@ -286,7 +293,11 @@
+@@ -287,7 +290,11 @@
%if "%{with_nntp}" == "yes"
--enable-nntp \
%endif
@@ -50,7 +83,7 @@
--without-krb
# build program
-@@ -410,9 +421,6 @@
+@@ -411,9 +418,6 @@
# before erase, stop service and remove log and temporary files
if [ $1 -eq 0 ]; then
%{l_rc} imapd stop 2>/dev/null
More information about the commits
mailing list