From 07894c357677444be496283976687ab4d2945b28 Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Nov 01 2019 22:32:26 +0000
Subject: Clean up config and spec


Signed-off-by: Kevin Fenzi <kevin@scrye.com>

---

diff --git a/fedora-config.patch b/fedora-config.patch
index ccf0275..44b87d7 100644
--- a/fedora-config.patch
+++ b/fedora-config.patch
@@ -1,6 +1,6 @@
-diff -Nur koji-1.18.0.orig/cli/koji.conf koji-1.18.0/cli/koji.conf
---- koji-1.18.0.orig/cli/koji.conf	2019-08-09 11:07:07.000000000 -0700
-+++ koji-1.18.0/cli/koji.conf	2019-08-16 08:14:51.834690613 -0700
+diff -Nur koji-1.19.0.orig/cli/koji.conf koji-1.19.0/cli/koji.conf
+--- koji-1.19.0.orig/cli/koji.conf	2019-10-30 11:50:10.000000000 -0700
++++ koji-1.19.0/cli/koji.conf	2019-10-31 18:28:37.518983298 -0700
 @@ -4,17 +4,22 @@
  
  ;url of XMLRPC server
@@ -13,10 +13,10 @@ diff -Nur koji-1.18.0.orig/cli/koji.conf koji-1.18.0/cli/koji.conf
  
  ;url of package download site
  ;pkgurl = http://www.example.com/packages
-+topurl = https://kojipkgs.fedoraproject.org/
  
  ;path to the koji top directory
  ;topdir = /mnt/koji
++topurl = https://kojipkgs.fedoraproject.org/
  
  ;configuration for Kerberos authentication
 +authtype = kerberos
@@ -24,15 +24,7 @@ diff -Nur koji-1.18.0.orig/cli/koji.conf koji-1.18.0/cli/koji.conf
  
  ;the service name of the principal being used by the hub
  ;krbservice = host
-@@ -28,7 +33,6 @@
- ;enable to lookup dns canonical hostname for krb auth
- ;krb_canon_host = no
- 
--
- ;configuration for SSL authentication
- 
- ;client certificate
-@@ -45,9 +49,14 @@
+@@ -48,9 +53,14 @@
  ;[not_implemented_yet]
  ;enabled plugins for CLI, runroot and save_failed_tree are available
  ;plugins =
diff --git a/koji.spec b/koji.spec
index 7959fa4..7ad52ba 100644
--- a/koji.spec
+++ b/koji.spec
@@ -447,7 +447,7 @@ done
 make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} %{?install_opt} install
 # alter python interpreter in koji CLI
 scripts='%{_bindir}/koji %{_sbindir}/kojid %{_sbindir}/kojira %{_sbindir}/koji-shadow
-         %{_sbindir}/koji-gc %{_sbindir}/kojivmd'
+         %{_sbindir}/koji-gc %{_sbindir}/kojivmd %{_sbindir}/koji-sweep-db'
 for fn in $scripts ; do
     sed -i 's|#!/usr/bin/python2|#!/usr/bin/python3|' $RPM_BUILD_ROOT$fn
 done
@@ -528,6 +528,11 @@ rm -f %{buildroot}/%{_libexecdir}/kojid/mergerepos
 %dir /etc/koji-hub
 %config(noreplace) /etc/koji-hub/hub.conf
 %dir /etc/koji-hub/hub.conf.d
+%{_sbindir}/koji-sweep-db
+%if %{use_systemd}
+%{_unitdir}/koji-sweep-db.service
+%{_unitdir}/koji-sweep-db.timer
+%endif
 
 %if 0%{py2_support} > 1
 %files -n python2-%{name}-hub
@@ -577,6 +582,7 @@ rm -f %{buildroot}/%{_libexecdir}/kojid/mergerepos
 %{_sbindir}/koji-gc
 %dir /etc/koji-gc
 %config(noreplace) /etc/koji-gc/koji-gc.conf
+%config(noreplace) /etc/koji-gc/email.tpl
 %{_sbindir}/koji-shadow
 %dir /etc/koji-shadow
 %config(noreplace) /etc/koji-shadow/koji-shadow.conf