.gitignore

@@ -1 +1,55 @@
-SOURCES/koji-1.35.1.tar.bz2
+koji-1.4.0.tar.bz2
+/koji-1.5.0.tar.bz2
+/koji-1.6.0.tar.bz2
+/koji-1.7.0.tar.bz2
+/koji-1.7.1.tar.bz2
+/koji-1.8.0.tar.bz2
+/koji-1.9.0.tar.bz2
+/koji-1.10.0.tar.bz2
+/koji-1.10.1.tar.bz2
+/koji-1.11.0.tar.bz2
+/koji-1.12.0.tar.bz2
+/koji-1.13.0.tar.bz2
+/koji-1.14.0.tar.bz2
+/koji-1.15.0.tar.bz2
+/koji-1.15.1.tar.bz2
+/koji-1.16.0.tar.bz2
+/koji-1.16.1.tar.bz2
+/koji-1.16.2.tar.bz2
+/koji-1.17.0.tar.bz2
+/koji-1.18.0.tar.bz2
+/koji-1.18.1.tar.bz2
+/koji-1.19.0.tar.bz2
+/koji-1.19.1.tar.bz2
+/koji-1.20.0.tar.bz2
+/koji-1.20.1.tar.bz2
+/koji-1.21.0.tar.bz2
+/koji-1.21.1.tar.bz2
+/koji-1.22.0.tar.bz2
+/koji-1.22.1.tar.bz2
+/koji-1.23.0.tar.bz2
+/koji-1.23.1.tar.bz2
+/koji-1.24.0.tar.bz2
+/koji-1.24.1.tar.bz2
+/koji-1.25.0.tar.bz2
+/koji-1.25.1.tar.bz2
+/koji-1.26.0.tar.bz2
+/koji-1.26.1.tar.bz2
+/koji-1.27.0.tar.bz2
+/koji-1.27.1.tar.bz2
+/koji-1.28.0.tar.bz2
+/koji-1.28.1.tar.bz2
+/koji-1.29.0.tar.bz2
+/koji-1.29.1.tar.bz2
+/koji-1.30.0.tar.bz2
+/koji-1.30.1.tar.bz2
+/koji-1.31.0.tar.bz2
+/koji-1.31.1.tar.bz2
+/koji-1.32.0.tar.bz2
+/koji-1.32.1.tar.bz2
+/koji-1.33.0.tar.bz2
+/koji-1.33.1.tar.bz2
+/koji-1.34.0.tar.bz2
+/koji-1.34.1.tar.bz2
+/koji-1.35.0.tar.bz2
+/koji-1.35.1.tar.bz2

.koji.metadata

@@ -1 +0,0 @@
-7dc628f4206df8865bb4c71db4ce8a0f41891c83  SOURCES/koji-1.35.1.tar.bz2

0001-repos-check-for-newer-create-event.patch

@@ -0,0 +1,25 @@
+From a0498970e73384a3bce62bc28f5f98f4feeabaff Mon Sep 17 00:00:00 2001
+From: Igor Raits <igor.raits@gmail.com>
+Date: Nov 05 2024 13:53:22 +0000
+Subject: repos: check for newer create event
+
+
+When the repo was just created, it has create_event that is the same as
+we are checking so the repo will never be considered latest.
+
+---
+
+diff --git a/kojihub/repos.py b/kojihub/repos.py
+index 5fc08ed..9a7fd03 100644
+--- a/kojihub/repos.py
++++ b/kojihub/repos.py
+@@ -333,7 +333,7 @@ def symlink_if_latest(repo):
+     clauses = [
+         ['tag_id', '=', repo['tag_id']],
+         ['state', '=', koji.REPO_READY],
+-        ['create_event', '>=', repo['create_event']]]
++        ['create_event', '>', repo['create_event']]]
+     if repo['dist']:
+         clauses.append(['dist', 'IS', True])
+     else:
+

koji.spec

@@ -9,7 +9,7 @@
 
 Name: koji
 Version: 1.35.1
-Release: 1%{?dist}
+Release: 3%{?dist}
 # the included arch lib from yum's rpmUtils is GPLv2+
 # Automatically converted from old format: LGPLv2 and GPLv2+ - review is highly recommended.
 License: LicenseRef-Callaway-LGPLv2 AND GPL-2.0-or-later
@@ -17,8 +17,11 @@ Summary: Build system tools
 URL: https://pagure.io/koji/
 Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2
 
+Patch1: https://pagure.io/koji/pull-request/4258.patch#/0001-repos-check-for-newer-create-event.patch
+
 # Not upstreamable
 Patch100: fedora-config.patch
+Patch101: pr4228-wait-repo-current.patch
 
 BuildArch: noarch
 Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
@@ -362,8 +365,8 @@ done
 %systemd_postun kojira.service
 
 %changelog
-* Wed Jan 01 2025 Arkady L. Shane <tigro@msvsphere-os.ru> - 1.35.1-1
+* Thu Oct 24 2024 Mike McLean <mikem@redhat.com> - 1.35.1-2
-- Rebuilt for MSVSphere 10
+- Backport PR #4228: wait for a current repo by default
 
 * Tue Oct 08 2024 Kevin Fenzi <kevin@scrye.com> - 1.35.1-1
 - Update to 1.35.1. Fixes rhbz#2316304

pr4228-wait-repo-current.patch

@@ -0,0 +1,64 @@
+commit 9b08aad4f49a7dc432fa466e2361b111a9870a63 (from 57040f731336a77ef308e5101719c65ed2af765c)
+Merge: 57040f731 a9f92c503
+Author: Mike McLean <mikem@redhat.com>
+Date:   Thu Oct 24 08:13:45 2024 -0400
+
+    PR#4228: cli: wait-repo: wait for a current repo by default
+    
+    Merges #4228
+    https://pagure.io/koji/pull-request/4228
+    
+    Fixes: #4229
+    https://pagure.io/koji/issue/4229
+    cli: wait-repo can report an older repo
+    
+    Fixes: #4226
+    https://pagure.io/koji/issue/4226
+    koji wait-repo command behaviour change / regression in 1.35
+    
+    Relates: #4227
+    https://pagure.io/koji/issue/4227
+    koji 1.35: blocking a package from a tag does not seem to cause newRepo tasks
+
+diff --git a/cli/koji_cli/commands.py b/cli/koji_cli/commands.py
+index dece662c5..0df721c80 100644
+--- a/cli/koji_cli/commands.py
++++ b/cli/koji_cli/commands.py
+@@ -7360,8 +7360,14 @@ def anon_handle_wait_repo(options, session, args):
+             error('' if suboptions.quiet else msg)
+         return
+ 
++    if builds:
++        # we're waiting for a repo with these builds, not necessarily a current one
++        min_event = None
++    else:
++        # wait for a current repo
++        min_event = "last"
+     watcher = _get_watcher(options, suboptions, session, tag['id'], nvrs=suboptions.builds,
+-                           min_event=None)
++                           min_event=min_event)
+ 
+     try:
+         repoinfo = watcher.waitrepo(anon=anon)
+diff --git a/tests/test_cli/test_wait_repo.py b/tests/test_cli/test_wait_repo.py
+index 2f2714ec5..bbd222665 100644
+--- a/tests/test_cli/test_wait_repo.py
++++ b/tests/test_cli/test_wait_repo.py
+@@ -206,7 +206,7 @@ class TestWaitRepo(utils.CliTestCase):
+ 
+         expected = "%(name)s is not a build tag for any target" % self.TAG + "\n"
+         self.assert_console_message(stderr, expected)
+-        self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event=None, logger=self.wait_logger)
++        self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event="last", logger=self.wait_logger)
+ 
+         # Cas 2. dest is matched, show suggestion
+         self.RepoWatcher.reset_mock()
+@@ -222,7 +222,7 @@ class TestWaitRepo(utils.CliTestCase):
+         expected = "%(name)s is not a build tag for any target" % self.TAG + "\n"
+         expected += "Suggested tags: build-tag-1, build-tag-2, build-tag-3\n"
+         self.assert_console_message(stderr, expected)
+-        self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event=None, logger=self.wait_logger)
++        self.RepoWatcher.assert_called_with(self.session, self.TAG['id'], nvrs=[], min_event="last", logger=self.wait_logger)
+ 
+     def test_anon_handle_wait_repo_help(self):
+         """Test anon_handle_wait_repo help message"""

sources

@@ -0,0 +1 @@
+SHA512 (koji-1.35.1.tar.bz2) = b4909e95768e397ac424825ab772613baffe4ee46446bcf7e90105610907b75838eb9b5a67cc534e1efb05754847689d5540c5a9ae053e9b75de1c9d7e03f91e