diff --git a/.gitignore b/.gitignore index 1aed85d..838e5bb 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ koji-1.4.0.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 diff --git a/482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch b/482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch new file mode 100644 index 0000000..54838d8 --- /dev/null +++ b/482ea1eda8d178e033fb68ee8cd01df95e2c1452.patch @@ -0,0 +1,28 @@ +From 482ea1eda8d178e033fb68ee8cd01df95e2c1452 Mon Sep 17 00:00:00 2001 +From: Tomas Kopecek +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 + ;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 f311a5c..d8bc907 100644 --- a/koji.spec +++ b/koji.spec @@ -8,7 +8,7 @@ %{?!python3_pkgversion:%global python3_pkgversion 3} Name: koji -Version: 1.24.0 +Version: 1.24.1 Release: 1%{?dist} # the included arch lib from yum's rpmUtils is GPLv2+ License: LGPLv2 and GPLv2+ @@ -16,6 +16,9 @@ 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 @@ -36,7 +39,6 @@ Summary: Build system tools python library BuildRequires: python%{python3_pkgversion}-devel BuildRequires: make Requires: python%{python3_pkgversion}-rpm -Requires: python%{python3_pkgversion}-pyOpenSSL Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-requests-gssapi Requires: python%{python3_pkgversion}-dateutil @@ -336,6 +338,9 @@ done %systemd_postun kojira.service %changelog +* Tue Apr 13 2021 Kevin Fenzi - 1.24.1-1 +- Update to 1.24.1. Fixes rhbz#1948545 + * Thu Feb 18 2021 Kevin Fenzi - 1.24.0-1 - Update to 1.24.0. Fixes rhbz#1930032 diff --git a/sources b/sources index 8d9a25e..a0a3006 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (koji-1.24.0.tar.bz2) = 42453ec35b2ce8e040d5f3bff1fce751c8d4505073e7e5fdfafb1a26cf4fccac75a78a26ef536fb3e81e43a96cd82acfd17b6a4e26d1243368697071786409bd +SHA512 (koji-1.24.1.tar.bz2) = a22bf26e261afad5778b252d71dfe1c59bee014e7c85028a1db6a2616cc6d8b54651b6a36e34fe55360ed554d74dfd906316c1f04eef8e7bbde752b72675d6b4