.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1 @@
-SOURCES/imaptest-20200324.tar.gz
+/imaptest-????????.tar.gz

.imaptest.metadata

@@ -1 +0,0 @@
-8f23735ceee67b7d92d3b03dba42f267c97442ee SOURCES/imaptest-20200324.tar.gz

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

gating.yaml

@@ -0,0 +1,25 @@
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_testing
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#Rawhide
+--- !Policy
+product_versions:
+  - fedora-*
+decision_context: bodhi_update_push_stable
+subject_type: koji_build
+rules:
+  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
+ 
+#gating rhel
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}
+  - !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

imaptest.spec

@@ -1,24 +1,20 @@
-%global git_commit 074d3e36c78131f0a7d606233f8466209623df55
+%global git_commit 19add789ce56e3046e1d7fc4968f9b86010b582c
-%global git_date 20200324
+%global git_date 20210507
 
 %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
+Summary:        Generic IMAP server compliancy tester
 Name:           imaptest
 # Upstream is not really planning on adding version numbers
-Version:	20200324
+Version:        %{git_date}
-Release:        2.%{git_suffix}%{?dist}
+Release:        2%{?dist}
 License:        MIT
-Group:		Applications/Internet
 URL:            https://www.imapwiki.org/ImapTest
-
-##  core=2.3 branch
 Source0:        https://github.com/dovecot/%{name}/archive/%{git_commit}/%{name}-%{version}.tar.gz
-BuildRequires:	dovecot-devel >= 2.2.15
+BuildRequires:  gcc, make, dovecot-devel >= 2.3.0
 BuildRequires:  autoconf, automake, libtool
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 ImapTest is a generic IMAP server compliancy tester that works with all IMAP
@@ -28,10 +24,10 @@ commands to the server and verifies that server's output looks correct. Using
 the scripted testing ImapTest runs a list of predefined scripted tests and
 verifies that server returns expected output.
 
-Examples and details are provided online at: http://www.imapwiki.org/ImapTest
+Examples and details are provided online at: https://www.imapwiki.org/ImapTest
 
 %prep
-%autosetup -n %{name}-%{git_commit}
+%autosetup -p1 -n %{name}-%{git_commit}
 autoreconf -i
 
 # Workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1103927#c4 (and later)
@@ -39,36 +35,80 @@ sed -e 's@\(^LIBDOVECOT .*\)@\1 -Wl,-rpath -Wl,%{_libdir}/dovecot@' -i src/Makef
 
 %build
 %configure --with-dovecot=%{_libdir}/dovecot
-make %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf $RPM_BUILD_ROOT
+%make_install
-make DESTDIR=$RPM_BUILD_ROOT install
 
 # Copy test files for later shipping
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/
 cp -pr src/tests/ $RPM_BUILD_ROOT%{_datadir}/%{name}/
 
-%clean
+%check
-rm -rf $RPM_BUILD_ROOT
+$RPM_BUILD_ROOT%{_bindir}/%{name} --help
 
 %files
-%defattr(-,root,root,-)
-%{!?_licensedir:%global license %%doc}
 %license COPYING COPYING.MIT
 %doc AUTHORS NEWS profile.conf pop3-profile.conf
 %{_bindir}/%{name}
 %{_datadir}/%{name}/
 
 %changelog
-* Tue Apr 21 2020  <pavel@pzhukov-laptop.zhukoff.net> - 20200324-2
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 20210507-2
-- Resolves: #1680950 - Test gating
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Tue Mar 24 2020  <pavel@pzhukov-laptop.zhukoff.net> - 20200324-1
+* Thu Jul 29 2021 Pavel Zhukov <pzhukov@redhat.com> - 20210507-1
-- Resolves: #1776856 - Rebase for new dovecot API
+- Rebuild with new dovecot
 
-* Tue Mar 24 2020  <pavel@pzhukov-laptop.zhukoff.net> - 20170719-3
+* Tue Jun 22 2021 Mohan Boddu <mboddu@redhat.com> - 20210305-3
-- Resolves: #1776856 - Rebuild with new dovecot
+- Rebuilt for RHEL 9 BETA for openssl 3.0
+  Related: rhbz#1971065
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 20210305-2
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Sat Mar 06 2021 Robert Scheck <robert@fedoraproject.org> 20210305-1
+- Upgrade to 20210305 (#1935535)
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20210116-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Jan 18 2021 Robert Scheck <robert@fedoraproject.org> 20210116-1
+- Upgrade to 20210116 (#1916982)
+
+* Sat Nov 07 2020 Robert Scheck <robert@fedoraproject.org> 20200904-1
+- Upgrade to 20200904
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190614-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20190614-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Nov 25 2019 Robert Scheck <robert@fedoraproject.org> 20190614-2
+- Rebuilt for Dovecot 2.3.x ABI incompatibility (#1776476)
+
+* Sun Jul 28 2019 Robert Scheck <robert@fedoraproject.org> 20190614-1
+- Upgrade to 20190614
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180824-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 20180824-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Sun Nov 11 2018 Robert Scheck <robert@fedoraproject.org> 20180824-2
+- Remove (broken) versioned dovecot requirement
+
+* Thu Nov 01 2018 Robert Scheck <robert@fedoraproject.org> 20180824-1
+- Upgrade to 20180824
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20180221-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Tue Apr 03 2018 Robert Scheck <robert@fedoraproject.org> 20180221-1
+- Upgrade to 20180221 (#1562970)
 
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 20170719-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

plans.fmf

@@ -0,0 +1,36 @@
+/tier1-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/imaptest.git
+      name: /plans/tier1/internal
+
+/tier1-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/imaptest.git
+      name: /plans/tier1/public
+
+/tier2-tier3-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/imaptest.git
+      name: /plans/tier2-tier3/internal
+
+/tier2-tier3-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/imaptest.git
+      name: /plans/tier2-tier3/public
+
+/others-internal:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/imaptest.git
+      name: /plans/others/internal
+
+/others-public:
+  plan:
+    import:
+      url: https://src.fedoraproject.org/tests/imaptest.git
+      name: /plans/others/public
+

sources

@@ -0,0 +1 @@
+SHA512 (imaptest-20210507.tar.gz) = 146b42668bbb675d8f35c9259212af7a81fdd585a304cd7bba4ce3845a3b1c3ac84727a73d4c32aa2ebf186308cb7f47133bfd7a739c1fd8af6f4984b1aa5585