From 03d3c69b46c270dd65859f68cc8486c8dae58e8b Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Mar 10 2019 15:51:51 +0000 Subject: Add patch proposed upstream to use createrepo_c by default to drop yum dependency --- diff --git a/koji-PR1278-use-createrepo_c-by-default.patch b/koji-PR1278-use-createrepo_c-by-default.patch new file mode 100644 index 0000000..8940256 --- /dev/null +++ b/koji-PR1278-use-createrepo_c-by-default.patch @@ -0,0 +1,37 @@ +From 781a09a9750a18b77208e58eaa960b1b0d3f7dac Mon Sep 17 00:00:00 2001 +From: Tomas Kopecek +Date: Feb 25 2019 13:50:30 +0000 +Subject: createrepo_c is used by default now + + +Fixes: https://pagure.io/koji/issue/716 + +--- + +diff --git a/builder/kojid b/builder/kojid +index e7c87f9..5e97615 100755 +--- a/builder/kojid ++++ b/builder/kojid +@@ -5975,7 +5975,7 @@ def get_options(): + 'timeout': None, + 'no_ssl_verify': False, + 'use_fast_upload': True, +- 'use_createrepo_c': False, ++ 'use_createrepo_c': True, + 'createrepo_skip_stat': True, + 'createrepo_update': True, + 'pkgurl': None, +diff --git a/builder/kojid.conf b/builder/kojid.conf +index 7bc235d..b9f0851 100644 +--- a/builder/kojid.conf ++++ b/builder/kojid.conf +@@ -50,7 +50,7 @@ server=http://hub.example.com/kojihub + topurl=http://hub.example.com/kojifiles + + ; use createrepo_c rather than createrepo +-; use_createrepo_c=False ++; use_createrepo_c=True + + ; A space-separated list of tuples from which kojid is allowed to checkout. + ; The format of those tuples is: + diff --git a/koji.spec b/koji.spec index c4c7cad..8e80424 100644 --- a/koji.spec +++ b/koji.spec @@ -78,13 +78,18 @@ Name: koji Version: 1.17.0 -Release: 3%{?dist} +Release: 4%{?dist} # the included arch lib from yum's rpmUtils is GPLv2+ License: LGPLv2 and GPLv2+ Summary: Build system tools URL: https://pagure.io/koji/ Source0: https://releases.pagure.org/koji/koji-%{version}.tar.bz2 +# Patches proposed upstream +## Use createrepo_c by default now (we already do this in Fedora infra anyway) +## From: https://pagure.io/koji/pull-request/1278 +Patch10: koji-PR1278-use-createrepo_c-by-default.patch + # Not upstreamable Patch100: fedora-config.patch @@ -288,7 +293,7 @@ Requires(preun): /sbin/service Requires: /usr/bin/cvs Requires: /usr/bin/svn Requires: /usr/bin/git -Requires: createrepo >= 0.9.2 +Requires: createrepo_c >= 0.10.0 %if 0%{py3_support} > 1 Requires: python%{python3_pkgversion}-%{name} = %{version}-%{release} Requires: python%{python3_pkgversion}-librepo @@ -404,6 +409,8 @@ koji-web is a web UI to the Koji system. %prep %setup -q +%patch10 -p1 -b .createrepo_c + %patch100 -p1 -b .fedoraconfig @@ -680,6 +687,9 @@ fi %endif %changelog +* Sun Mar 10 2019 Neal Gompa - 1.17.0-4 +- Add patch proposed upstream to use createrepo_c by default to drop yum dependency + * Sun Mar 10 2019 Neal Gompa - 1.17.0-3 - Remove remnants of unused /usr/libexec/koji-hub