Merge remote-tracking branch 'origin/rawhide' into epel9

Currently, the latest symlink is never updated.

.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

fedora-config.patch

@@ -1,29 +1,19 @@
-From 895f7262039233b0fe27d867d5cdf401a6d3c3b9 Mon Sep 17 00:00:00 2001
-From: Sergey Cherevko <s.cherevko@msvsphere-os.ru>
-Date: Mon, 16 Oct 2023 10:02:39 +0300
-Subject: [PATCH] msvsphere config
-
----
- cli/koji.conf | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/cli/koji.conf b/cli/koji.conf
-index 331751d..fad50df 100644
---- a/cli/koji.conf
-+++ b/cli/koji.conf
+diff --color -Nur koji-1.27.0.orig/cli/koji.conf koji-1.27.0/cli/koji.conf
+--- koji-1.27.0.orig/cli/koji.conf	2021-11-18 02:28:38.000000000 -0800
++++ koji-1.27.0/cli/koji.conf	2021-11-18 13:33:55.468796788 -0800
 @@ -4,12 +4,15 @@
  
  ;url of XMLRPC server
  ;server = http://hub.example.com/kojihub
-+server = https://koji.inferitos.ru/kojihub
++server = https://koji.fedoraproject.org/kojihub
  
  ;url of web interface
  ;weburl = http://www.example.com/koji
-+weburl = https://koji.inferitos.ru/koji/
++weburl = https://koji.fedoraproject.org/koji
  
  ;url of package download site
  ;pkgurl = http://www.example.com/packages
-+topurl = https://koji.inferitos.ru/kojifiles/packages/
++topurl = https://kojipkgs.fedoraproject.org
  
  ;path to the koji top directory
  ;topdir = /mnt/koji
@@ -52,6 +42,3 @@ index 331751d..fad50df 100644
 +
 +; use the fast upload feature of koji by default
 +use_fast_upload = yes
--- 
-2.39.3
-

koji.spec

@@ -9,7 +9,7 @@
 
 Name: koji
 Version: 1.35.1
-Release: 3%{?dist}.inferit
+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
@@ -20,9 +20,8 @@ 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
-# MSVSphere
-Patch1000: 0001-msvsphere-config.patch
 
 BuildArch: noarch
 Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release}
@@ -366,9 +365,6 @@ done
 %systemd_postun kojira.service
 
 %changelog
-* Thu Nov 07 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.35.1-3.inferit
-- Update to 1.35.1-3
-
 * Thu Oct 24 2024 Mike McLean <mikem@redhat.com> - 1.35.1-2
 - Backport PR #4228: wait for a current repo by default
 
@@ -400,10 +396,6 @@ done
 * Fri Mar 22 2024 Kevin Fenzi <kevin@scrye.com> - 1.34.0-3
 - Add back in missing schema files. rhbz#2270743
 
-* Wed Mar 20 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.34.0-2.inferit
-- Upgrade to 1.34.0-2
-- Rebuild for MSVSphere 9.3
-
 * Mon Mar 18 2024 Kevin Fenzi <kevin@scrye.com> - 1.34.0-2
 - Carry scm policy plugin for hub, it's already upstream
 - Use dnf5 compatible 'group install' command
@@ -421,10 +413,6 @@ done
 * Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.33.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
-* Mon Oct 16 2023 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.33.1-2
-- MSVSphere config
-- Rebuilt for MSVSphere 9.2
-
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.33.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 

sources

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