From 6bdc893e25f29fd907ba24933ffb5b4c36b04d5e Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Wed, 20 May 2020 22:58:21 +0000
Subject: [PATCH] import imaptest-20200324-2.20200324git074d3e36.el8

---
 .gitignore          |  2 +-
 .imaptest.metadata  |  2 +-
 SPECS/imaptest.spec | 37 +++++++++++++++++++++++--------------
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3f4ec84..cc5313b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/imaptest-20170719.tar.gz
+SOURCES/imaptest-20200324.tar.gz
diff --git a/.imaptest.metadata b/.imaptest.metadata
index 3188f5e..4717e1d 100644
--- a/.imaptest.metadata
+++ b/.imaptest.metadata
@@ -1 +1 @@
-0a282de807fc43e4bd95edf96546f72838f337e5 SOURCES/imaptest-20170719.tar.gz
+8f23735ceee67b7d92d3b03dba42f267c97442ee SOURCES/imaptest-20200324.tar.gz
diff --git a/SPECS/imaptest.spec b/SPECS/imaptest.spec
index a125de7..5616bb2 100644
--- a/SPECS/imaptest.spec
+++ b/SPECS/imaptest.spec
@@ -1,21 +1,21 @@
+%global git_commit 074d3e36c78131f0a7d606233f8466209623df55
+%global git_date 20200324
+
+%global git_short_commit %(echo %{git_commit} | cut -c -8)
+%global git_suffix %{git_date}git%{git_short_commit}
+
+
 Summary:	A generic IMAP server compliancy tester
 Name:		imaptest
 # Upstream is not really planning on adding version numbers
-Version:	20170719
-Release:	2%{?dist}
+Version:	20200324
+Release:        2.%{git_suffix}%{?dist}
 License:	MIT
 Group:		Applications/Internet
 URL:		https://www.imapwiki.org/ImapTest
-# https://dovecot.org/nightly/%{name}/%{name}-%{version}.tar.gz is meant for
-# dovecot >= 2.3, which has not yet landed in Fedora.
-#
-# When generating tarball package from upstream git:
-# - git clone https://github.com/dovecot/imaptest.git
-# - cd imaptest; git checkout core-2.2; git checkout; git checkout c143e66
-# - Use the visible date of latest git log entry for %{version} in spec file
-# - git log > ChangeLog; rm -rf .git; cd ..; mv imaptest imaptest-20170719
-# - tar cfz imaptest-20170719.tar.gz imaptest-20170719
-Source0:	%{name}-%{version}.tar.gz
+
+##  core=2.3 branch
+Source0:        https://github.com/dovecot/%{name}/archive/%{git_commit}/%{name}-%{version}.tar.gz
 BuildRequires:	dovecot-devel >= 2.2.15
 BuildRequires:	autoconf, automake, libtool
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -31,7 +31,7 @@ verifies that server returns expected output.
 Examples and details are provided online at: http://www.imapwiki.org/ImapTest
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{git_commit}
 autoreconf -i
 
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1103927#c4 (and later)
@@ -56,11 +56,20 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.MIT
-%doc AUTHORS ChangeLog profile.conf pop3-profile.conf
+%doc AUTHORS NEWS profile.conf pop3-profile.conf
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 
 %changelog
+* Tue Apr 21 2020  <pavel@pzhukov-laptop.zhukoff.net> - 20200324-2
+- Resolves: #1680950 - Test gating
+
+* Tue Mar 24 2020  <pavel@pzhukov-laptop.zhukoff.net> - 20200324-1
+- Resolves: #1776856 - Rebase for new dovecot API
+
+* Tue Mar 24 2020  <pavel@pzhukov-laptop.zhukoff.net> - 20170719-3
+- Resolves: #1776856 - Rebuild with new dovecot
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170719-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild