@@ -18,9 +18,9 @@

 %global _cyrusgroup mail

 %global _cyrexecdir %{_exec_prefix}/lib/%{name}

-%global tag_version 2.5.13.30

-##%global revision    41

-##%global git_hash    gd53406f3f

+%global tag_version 2.5.13

+%global revision    36

+%global git_hash    gad62d5485

 ##

 ## Options

@@ -36,13 +36,13 @@

 Name:               cyrus-imapd

 Summary:            A high-performance mail server with IMAP, POP3, NNTP and SIEVE support

-Version:            %{tag_version}

+Version:            %{tag_version}.%{revision}

 Release:            1%{?dist}

 License:            BSD

 Group:              System Environment/Daemons

 URL:                http://www.cyrusimap.org

-Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{tag_version}.tar.gz

+Source0:            ftp://ftp.andrew.cmu.edu/pub/cyrus/%{name}-%{tag_version}-%{revision}-%{git_hash}.tar.gz

 Source1:            cyrus-imapd.imap-2.3.x-conf

 Source2:            cyrus-imapd.cvt_cyrusdb_all

 Source3:            cyrus-imapd.magic

@@ -257,7 +257,7 @@

 necessary for developing applications which use the imclient library.

 %prep

-%setup -q

+%setup -q -n %{name}-%{tag_version}-%{revision}-%{git_hash}

 %if 0%{?with_bdb} < 1

 sed -i -e 's/,berkeley//g' cunit/aaa-db.testc

@@ -755,6 +755,10 @@

 %{_libdir}/*.la

 %changelog

+* Wed Oct 23 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.13.36-1

+- Rebase on to upstream -2.5 series

+- Fix ptloader group membership (Bifrost T250286)

+

 * Mon Aug 19 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 2.5.12.30-1

 - Rebase on to upstream 2.5.13

​

@@ -2,7 +2,7 @@

 Source: cyrus-imapd

 Binary: cyrus-imapd

 Architecture: any

-Version: 2.5.12.30-0~kolab2

+Version: 2.5.13.36-0~kolab1

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Homepage: http://www.cyrusimap.org/

@@ -43,5 +43,5 @@

 Package-List:

  cyrus-imapd deb mail extra

 Files:

- 00000000000000000000000000000000 0 cyrus-imapd-2.5.13.30.tar.gz

+ 00000000000000000000000000000000 0 cyrus-imapd-2.5.13-36-gad62d5485.tar.gz

  00000000000000000000000000000000 0 debian.tar.gz

​

@@ -1,3 +1,10 @@

+cyrus-imapd (2.5.13.36-0~kolab1) unstable; urgency=low

+

+  * Rebase on to upstream 2.5.13

+  * Fix ptloader group membership (Bifrost T250286)

+

+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 23 Oct 2019 11:30:13 +0100

+

 cyrus-imapd (2.5.13.30-0~kolab2) unstable; urgency=low

   * Rebase on to upstream 2.5.13

​