From b521a1740f025e7690eab89700ce484cfb54d05e Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 28 2025 18:00:23 +0000
Subject: [PATCH 1/2] koji 1.35.3 release notes and version bump


---

diff --git a/docs/source/release_notes/release_notes.rst b/docs/source/release_notes/release_notes.rst
index ba4eafb..fd281b3 100644
--- a/docs/source/release_notes/release_notes.rst
+++ b/docs/source/release_notes/release_notes.rst
@@ -5,6 +5,7 @@ Release Notes
 .. toctree::
     :maxdepth: 1
 
+    release_notes_1.35.3
     release_notes_1.35.2
     release_notes_1.35.1
     release_notes_1.35
diff --git a/docs/source/release_notes/release_notes_1.35.3.rst b/docs/source/release_notes/release_notes_1.35.3.rst
new file mode 100644
index 0000000..d73dab0
--- /dev/null
+++ b/docs/source/release_notes/release_notes_1.35.3.rst
@@ -0,0 +1,98 @@
+Koji 1.35.3 Release notes
+=========================
+
+All changes can be found in `the roadmap <https://pagure.io/koji/roadmap/1.35.3/>`_.
+Most important changes are listed here.
+
+This is a small bugfix release to address a few issues in 1.35.2
+
+Migrating from Koji 1.35.x
+--------------------------
+
+No special action are needed.
+
+
+Security Fixes
+--------------
+
+None
+
+
+System Changes
+--------------
+
+**Handle duplicate logs for image imports**
+
+| PR: https://pagure.io/koji/pull-request/4232
+
+This works around a build import issue by adding the arch to the log path when an overlap is detected.
+
+
+**Fix min_avail calculation**
+
+| PR: https://pagure.io/koji/pull-request/4358
+
+This fixes an internal calculation in the scheduler code.
+
+
+**Fix hub option data types**
+
+| PR: https://pagure.io/koji/pull-request/4310
+
+This fixes the data types for several hub options that were added in 1.35.
+Prior to this fix, specifying some of these options could result in an error.
+
+
+Kojira
+------
+
+**Keep latest default repo for build tags**
+
+| PR: https://pagure.io/koji/pull-request/4270
+
+This change causes kojira to preserve the latest repo for a build tag, even if it is no longer current.
+
+Previously, because of the on-demand repo generation changes in 1.35, rarely used build targets could end
+up with no repo at all.
+
+
+Web UI
+------
+
+**Fix tasks url on userinfo page**
+
+| PR: https://pagure.io/koji/pull-request/4303
+
+A small bug fix in the web ui
+
+
+**Work around parse_qs behavior in python < 3.11**
+
+| PR: https://pagure.io/koji/pull-request/4334
+
+This fixes a web ui bug resulting from the removal of the cgi module dependency in 1.35.2.
+
+
+Devel and testing
+-----------------
+
+**Fix two unit test issues**
+
+| PR: https://pagure.io/koji/pull-request/4357
+
+
+**Fix python2 unittests**
+
+| PR: https://pagure.io/koji/pull-request/4341
+
+
+**Use unittest.mock instead of mock**
+
+| PR: https://pagure.io/koji/pull-request/4328
+
+
+**Remove fp file using os.unlink**
+
+| PR: https://pagure.io/koji/pull-request/4326
+
+Compatibility fix for unit tests
diff --git a/koji.spec b/koji.spec
index 920a5e7..a05fe3f 100644
--- a/koji.spec
+++ b/koji.spec
@@ -83,7 +83,7 @@
 %define release %{baserelease}
 %endif
 Name: koji
-Version: 1.35.2
+Version: 1.35.3
 Release: %{release}%{?dist}
 License: LGPL-2.1-only and GPL-2.0-or-later
 # the included arch lib from yum's rpmUtils is GPLv2+
diff --git a/koji/_version.py b/koji/_version.py
index 30873bc..87c7667 100644
--- a/koji/_version.py
+++ b/koji/_version.py
@@ -1,2 +1,2 @@
-__version_info__ = (1, 35, 2)
+__version_info__ = (1, 35, 3)
 __version__ = '.'.join([str(x) for x in __version_info__])

From 3df7de14eeb8ae085e426fd9428f77932f29d6b2 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: Apr 28 2025 18:00:23 +0000
Subject: [PATCH 2/2] include pending PRs


---

diff --git a/docs/source/release_notes/release_notes_1.35.3.rst b/docs/source/release_notes/release_notes_1.35.3.rst
index d73dab0..19b1fe4 100644
--- a/docs/source/release_notes/release_notes_1.35.3.rst
+++ b/docs/source/release_notes/release_notes_1.35.3.rst
@@ -43,6 +43,13 @@ This fixes the data types for several hub options that were added in 1.35.
 Prior to this fix, specifying some of these options could result in an error.
 
 
+**Revert py2 portion of mr#4214**
+
+| PR: https://pagure.io/koji/pull-request/4363
+
+This reverts part of a change from 1.35.2 that could cause build failures.
+
+
 Kojira
 ------
 
@@ -76,6 +83,14 @@ This fixes a web ui bug resulting from the removal of the cgi module dependency 
 Devel and testing
 -----------------
 
+**Honor %{_sbindir} in make install**
+
+| PR: https://pagure.io/koji/pull-request/4335
+
+This is a packaging change prompted by Fedora's efforts to
+`unify bin and sbin <https://fedoraproject.org/wiki/Changes/Unify_bin_and_sbin>`_.
+
+
 **Fix two unit test issues**
 
 | PR: https://pagure.io/koji/pull-request/4357

