From 66255362ffbd2657bb849cf5918b66a4c58c8a57 Mon Sep 17 00:00:00 2001 From: Tomas Hrcka Date: Tue, 11 May 2021 11:21:46 +0200 Subject: [PATCH 1/2] Add automeka builddep Signed-off-by: Tomas Hrcka --- fedora-packager.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-packager.spec b/fedora-packager.spec index 1696e48..a22d9c2 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -13,6 +13,7 @@ Source0: https://releases.pagure.org/fedora-packager/fedora-packager-%{ve BuildRequires: python3-devel BuildRequires: make +BuildRequires: automake Requires: koji >= 1.11.0 Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint From 168c85614c5bb8c69a9e455b19a85a7eaea057f9 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 4 Jun 2021 12:12:49 -0400 Subject: [PATCH 2/2] Make fedora-packager-kerberos subpackage Breaks out the kerberos configs into own subpackage so that users who want to connect to kerberos but not install all the depenencies of `fedora-packager` can do that. Fixes https://pagure.io/fedora-packager/issue/152 Signed-off-by: Dusty Mabe --- fedora-packager.spec | 50 ++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/fedora-packager.spec b/fedora-packager.spec index a22d9c2..fc476ab 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.6 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -21,20 +21,8 @@ Requires: mock curl openssh-clients Requires: redhat-rpm-config Requires: fedpkg >= 1.0 Obsoletes: fedora-cert < 0.6.0.3-4 -# This is the version in which SNI was fixed -%if 0%{?fedora} -Requires: krb5-workstation >= 1.14.3-4 -%else -%if 0%{?rhel} >= 7 -Requires: krb5-workstation >= 1.14.1-24 -%else -# older rhels wont fully work without configuration, but lets make sure they have krb -# we should be able to assume newer RHELs's will have a new enough version -Requires: krb5-workstation -%endif -%endif -Requires: krb5-pkinit Recommends: fedora-packager-yubikey +Recommends: fedora-packager-kerberos BuildArch: noarch @@ -52,6 +40,27 @@ BuildArch: noarch %description yubikey A tool for setting up a yubikey for use in fedora +%package kerberos +Summary: files for connecting via kerberos to Fedora +# This is the version in which SNI was fixed +%if 0%{?fedora} +Requires: krb5-workstation >= 1.14.3-4 +%else +%if 0%{?rhel} >= 7 +Requires: krb5-workstation >= 1.14.1-24 +%else +# older rhels wont fully work without configuration, but lets make sure they have krb +# we should be able to assume newer RHELs's will have a new enough version +Requires: krb5-workstation +%endif +%endif +Requires: krb5-pkinit + +BuildArch: noarch + +%description kerberos +Files for connecting via kerberos to Fedora + %prep %setup -q @@ -71,19 +80,28 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %exclude %{_bindir}/fedora-packager-setup %exclude %{_bindir}/fedoradev-pkgowners %exclude %{_bindir}/fedora-cert +%exclude %{_bindir}/fkinit %exclude %{python3_sitelib}/fedora_cert %config(noreplace) %{_sysconfdir}/koji.conf.d/* -%config %{_sysconfdir}/krb5.conf.d/* -%{_sysconfdir}/pki/ipa/* %files yubikey %license COPYING %{_sbindir}/* +%files kerberos +%license COPYING +%{_bindir}/fkinit +%config %{_sysconfdir}/krb5.conf.d/* +%{_sysconfdir}/pki/ipa/* + %changelog +* Fri Jun 04 2021 Dusty Mabe - 0.6.0.6-2 +- Create subpackage for kerberos configs. +- Fixes https://pagure.io/fedora-packager/issue/152 + * Tue May 11 2021 Tomas Hrcka - 0.6.0.6-1 - Add fkinit (sgallagh)