From 47feb077acebaa606e21ca807fa2c27c2f58a500 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Jan 22 2020 09:25:44 +0000 Subject: move fedora-burn-yubikey to a subpackge rhbz#756413 Signed-off-by: Dennis Gilmore --- diff --git a/fedora-packager.spec b/fedora-packager.spec index 77b1623..9338870 100644 --- a/fedora-packager.spec +++ b/fedora-packager.spec @@ -4,7 +4,7 @@ Name: fedora-packager Version: 0.6.0.2 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Tools for setting up a fedora maintainer environment License: GPLv2+ @@ -16,12 +16,9 @@ Requires: koji >= 1.11.0 Requires: bodhi-client Requires: rpm-build rpmdevtools rpmlint Requires: mock curl openssh-clients -# For fedora-burn-yubikey.py -Requires: python3-yubico Requires: redhat-rpm-config Requires: fedpkg >= 1.0 Obsoletes: fedora-cert < 0.6.0.3-4 -Recommends: ykpers # This is the version in which SNI was fixed %if 0%{?fedora} Requires: krb5-workstation >= 1.14.3-4 @@ -34,12 +31,23 @@ Requires: krb5-workstation >= 1.14.1-24 Requires: krb5-workstation %endif %endif +Recommends: fedora-packager-yubikey BuildArch: noarch %description Set of utilities useful for a fedora packager in setting up their environment. +%package yubikey +Summary: tool for setting up a yubikey for use in Fedora +# For fedora-burn-yubikey.py +Requires: python3-yubico +Recommends: ykpers + +BuildArch: noarch + +%description yubikey +A tool for setting up a yubikey for use in fedora %prep %setup -q @@ -56,7 +64,6 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %license COPYING %doc TODO AUTHORS ChangeLog %{_bindir}/* -%{_sbindir}/* %exclude %{_bindir}/fedora-hosted %exclude %{_bindir}/fedora-packager-setup %exclude %{_bindir}/fedoradev-pkgowners @@ -66,7 +73,14 @@ sed -i -r 's|#!/usr/bin/python$|#!%{__python3}|' %{buildroot}/usr/*bin/* %config(noreplace) %{_sysconfdir}/koji.conf.d/* %config(noreplace) %{_sysconfdir}/krb5.conf.d/* +%files yubikey +%license COPYING +%{_sbindir}/* + %changelog +* Wed Jan 22 2020 Dennis Gilmore - 0.6.0.2-7 +- move fedora-burn-yubikey to a subpackge rhbz#756413 + * Thu Jul 25 2019 Fedora Release Engineering - 0.6.0.2-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild