Clean up config and spec

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
epel9
Kevin Fenzi 5 years ago
parent bb9b233e56
commit 07894c3576

@ -1,6 +1,6 @@
diff -Nur koji-1.18.0.orig/cli/koji.conf koji-1.18.0/cli/koji.conf diff -Nur koji-1.19.0.orig/cli/koji.conf koji-1.19.0/cli/koji.conf
--- koji-1.18.0.orig/cli/koji.conf 2019-08-09 11:07:07.000000000 -0700 --- koji-1.19.0.orig/cli/koji.conf 2019-10-30 11:50:10.000000000 -0700
+++ koji-1.18.0/cli/koji.conf 2019-08-16 08:14:51.834690613 -0700 +++ koji-1.19.0/cli/koji.conf 2019-10-31 18:28:37.518983298 -0700
@@ -4,17 +4,22 @@ @@ -4,17 +4,22 @@
;url of XMLRPC server ;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 ;url of package download site
;pkgurl = http://www.example.com/packages ;pkgurl = http://www.example.com/packages
+topurl = https://kojipkgs.fedoraproject.org/
;path to the koji top directory ;path to the koji top directory
;topdir = /mnt/koji ;topdir = /mnt/koji
+topurl = https://kojipkgs.fedoraproject.org/
;configuration for Kerberos authentication ;configuration for Kerberos authentication
+authtype = kerberos +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 ;the service name of the principal being used by the hub
;krbservice = host ;krbservice = host
@@ -28,7 +33,6 @@ @@ -48,9 +53,14 @@
;enable to lookup dns canonical hostname for krb auth
;krb_canon_host = no
-
;configuration for SSL authentication
;client certificate
@@ -45,9 +49,14 @@
;[not_implemented_yet] ;[not_implemented_yet]
;enabled plugins for CLI, runroot and save_failed_tree are available ;enabled plugins for CLI, runroot and save_failed_tree are available
;plugins = ;plugins =

@ -447,7 +447,7 @@ done
make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} %{?install_opt} install make DESTDIR=$RPM_BUILD_ROOT PYTHON=%{__python3} %{?install_opt} install
# alter python interpreter in koji CLI # alter python interpreter in koji CLI
scripts='%{_bindir}/koji %{_sbindir}/kojid %{_sbindir}/kojira %{_sbindir}/koji-shadow 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 for fn in $scripts ; do
sed -i 's|#!/usr/bin/python2|#!/usr/bin/python3|' $RPM_BUILD_ROOT$fn sed -i 's|#!/usr/bin/python2|#!/usr/bin/python3|' $RPM_BUILD_ROOT$fn
done done
@ -528,6 +528,11 @@ rm -f %{buildroot}/%{_libexecdir}/kojid/mergerepos
%dir /etc/koji-hub %dir /etc/koji-hub
%config(noreplace) /etc/koji-hub/hub.conf %config(noreplace) /etc/koji-hub/hub.conf
%dir /etc/koji-hub/hub.conf.d %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 %if 0%{py2_support} > 1
%files -n python2-%{name}-hub %files -n python2-%{name}-hub
@ -577,6 +582,7 @@ rm -f %{buildroot}/%{_libexecdir}/kojid/mergerepos
%{_sbindir}/koji-gc %{_sbindir}/koji-gc
%dir /etc/koji-gc %dir /etc/koji-gc
%config(noreplace) /etc/koji-gc/koji-gc.conf %config(noreplace) /etc/koji-gc/koji-gc.conf
%config(noreplace) /etc/koji-gc/email.tpl
%{_sbindir}/koji-shadow %{_sbindir}/koji-shadow
%dir /etc/koji-shadow %dir /etc/koji-shadow
%config(noreplace) /etc/koji-shadow/koji-shadow.conf %config(noreplace) /etc/koji-shadow/koji-shadow.conf

Loading…
Cancel
Save