From a04a71b6c405d454311d1cab838062df46872d13 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Thu, 20 May 2021 16:11:42 -0700
Subject: [PATCH] Update to 1.25.0. Fixes rhbz#1962636

---
 .gitignore                                    |  1 +
 ...a1eda8d178e033fb68ee8cd01df95e2c1452.patch | 28 -------------------
 koji.spec                                     |  8 +++---
 sources                                       |  2 +-
 4 files changed, 6 insertions(+), 33 deletions(-)
 delete mode 100644 482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch

diff --git a/.gitignore b/.gitignore
index 838e5bb..50ca8ad 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,3 +31,4 @@ koji-1.4.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
diff --git a/482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch b/482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch
deleted file mode 100644
index 54838d8..0000000
--- a/482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 482ea1eda8d178e033fb68ee8cd01df95e2c1452 Mon Sep 17 00:00:00 2001
-From: Tomas Kopecek <tkopecek@redhat.com>
-Date: Apr 06 2021 11:38:13 +0000
-Subject: PR#2799: kojid.conf: fix linewrapped comment
-
-
-Merges #2799
-https://pagure.io/koji/pull-request/2799
-
-Fixes: #2800
-https://pagure.io/koji/issue/2800
- kojid.conf: fix linewrapped comment
-
----
-
-diff --git a/builder/kojid.conf b/builder/kojid.conf
-index bc4b297..1ce0f18 100644
---- a/builder/kojid.conf
-+++ b/builder/kojid.conf
-@@ -136,6 +136,5 @@ from_addr=Koji Build System <buildsys@example.com>
- ;none of these is enabled by default
- ;plugin = 
- 
--;path where builder plugins are located, there could be multiple paths delimited
--by :
-+;path where builder plugins are located, there could be multiple paths delimited by :
- ;pluginpath = /usr/lib/koji-builder-plugins
-
diff --git a/koji.spec b/koji.spec
index c4e65a2..70c8352 100644
--- a/koji.spec
+++ b/koji.spec
@@ -8,7 +8,7 @@
 %{?!python3_pkgversion:%global python3_pkgversion 3}
 
 Name: koji
-Version: 1.24.1
+Version: 1.25.0
 Release: 1%{?dist}
 # the included arch lib from yum's rpmUtils is GPLv2+
 License: LGPLv2 and GPLv2+
@@ -16,9 +16,6 @@ Summary: Build system tools
 URL: https://pagure.io/koji/
 Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2
 
-# already upstream patch to fix a line wrap problem in kojid.conf
-Patch1: https://pagure.io/koji/c/482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch
-
 # Not upstreamable
 Patch100: fedora-config.patch
 
@@ -339,6 +336,9 @@ done
 %systemd_postun kojira.service
 
 %changelog
+* Thu May 20 2021 Kevin Fenzi <kevin@scrye.com> - 1.25.0-1
+- Update to 1.25.0. Fixes rhbz#1962636
+
 * Tue Apr 13 2021 Kevin Fenzi <kevin@scrye.com> - 1.24.1-1
 - Update to 1.24.1. Fixes rhbz#1948545
 
diff --git a/sources b/sources
index a0a3006..0275da1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (koji-1.24.1.tar.bz2) = a22bf26e261afad5778b252d71dfe1c59bee014e7c85028a1db6a2616cc6d8b54651b6a36e34fe55360ed554d74dfd906316c1f04eef8e7bbde752b72675d6b4
+SHA512 (koji-1.25.0.tar.bz2) = db654b5ee8c4922c93aed6298c1967d4a01520197d1b7e052b3fbd8531deb881b08d18f804e0b54c495d8a5aa49bc574c4b41b56818ec867b40335cc9383b21c