[packaging] Branch 'feature-el6-kolab-3.0' - cyrus-imapd.spec .gitignore sources

Jeroen van Meeuwen vanmeeuwen at kolabsys.com
Sat Dec 1 21:22:36 CET 2012


 .gitignore       |    1 +
 cyrus-imapd.spec |   10 +++++-----
 sources          |    2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

New commits:
commit d67e9a3a9f8061cd17925f4ea57020f4ee2a6eab
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sat Dec 1 20:22:17 2012 +0000

    Check in new upstream version 2.4.17

diff --git a/.gitignore b/.gitignore
index 7014b44..a1f57c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ cyrus_sharedbackup-0.1.tar.gz
 /cyrus-imapd-2.4.14.tar.gz
 /cyrus-imapd-2.4.15.git201204161439.tar.gz
 /cyrus-imapd-2.4.16.tar.gz
+/cyrus-imapd-2.4.17.tar.gz
diff --git a/cyrus-imapd.spec b/cyrus-imapd.spec
index 1df8322..45b7db7 100644
--- a/cyrus-imapd.spec
+++ b/cyrus-imapd.spec
@@ -17,8 +17,8 @@
 
 Name:               cyrus-imapd
 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support
-Version:            2.4.16
-Release:            2%{?dist}
+Version:            2.4.17
+Release:            1%{?dist}
 License:            BSD
 Group:              System Environment/Daemons
 URL:                http://www.cyrusimap.org
@@ -61,7 +61,6 @@ Patch002:           %{name}-2.3.16-002-strip-out-krb4.patch
 #Patch102:           %{name}-2.3.16-102-autosieve-0.6.0.patch
 
 # Patches cherry-picked from GIT stable branch(es)
-Patch201:           cyrus-imapd-2.4.16-ticket-3754.patch
 
 # Patches of which the status or upstream is unknown
 Patch903:           %{name}-2.4.15-903-normalize-authorization-id.patch
@@ -177,8 +176,6 @@ one running the server.
 %setup -q -n %{_name}-%{real_version}%{?dot_snapshot_version}
 %patch002 -p1
 
-%patch201 -p1
-
 %patch903 -p1
 %patch905 -p1
 
@@ -566,6 +563,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Dec  1 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 2.4.17-1
+- New upstream version
+
 * Wed Nov 21 2012 Jeroen van Meeuwen <vanmeeuwen at kolabsys.com> - 2.4.16-2
 - Ship fix for APPEND BINARY GUID (#3754)
 
diff --git a/sources b/sources
index 19bd366..7768ddc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-de618faf08ec3e0222a71630f3c98944  cyrus-imapd-2.4.16.tar.gz
+c1747c6252587535d3d27f71eca8bd44  cyrus-imapd-2.4.17.tar.gz




More information about the packaging-commits mailing list