PR#173: Make fedora-packager-kerberos subpackage - fedora-packager

fedora-packager

#173 Make fedora-packager-kerberos subpackage

Merged 2 years ago by mohanboddu. Opened 2 years ago by dustymabe.

dustymabe/fedora-packager dusty-subpackage into main

Make fedora-packager-kerberos subpackage

Dusty Mabe • 2 years ago

98e6d8e

fedora-packager.spec

file modified

+34 -16

		`@@ -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: 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 @@`
		`%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 @@`
		`%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 <dusty@dustymabe.com> - 0.6.0.6-2`
		`+ - Create subpackage for kerberos configs.`
		`+ - Fixes https://pagure.io/fedora-packager/issue/152`
		`+`
		`* Tue May 11 2021 Tomas Hrcka <thrcka@redhat.com> - 0.6.0.6-1`
		`- Add fkinit (sgallagh)`

dustymabe commented 2 years ago

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

dustymabe commented 2 years ago

Updated list of files in each package:

[dustymabe@media fedora-packager (upstreammain *%=)]$ rpm -qlp /home/dustymabe/rpmbuild/RPMS/noarch/fedora-packager-kerberos-0.6.0.6-1.fc33.noarch.rpm 
/etc/krb5.conf.d/fedoraproject_org
/etc/krb5.conf.d/stg_fedoraproject_org
/etc/pki/ipa/fedoraproject_ipa_ca.crt
/etc/pki/ipa/stg_fedoraproject_ipa_ca.crt
/usr/bin/fkinit
/usr/share/licenses/fedora-packager-kerberos
/usr/share/licenses/fedora-packager-kerberos/COPYING
[dustymabe@media fedora-packager (upstreammain *%=)]$ rpm -qlp /home/dustymabe/rpmbuild/RPMS/noarch/fedora-packager-0.6.0.6-1.fc33.noarch.rpm 
/etc/koji.conf.d/fedora.conf
/etc/koji.conf.d/s390.conf
/etc/koji.conf.d/stg.conf
/usr/bin/fedora-getsvn
/usr/bin/pkgname
/usr/bin/rpmbuild-md5
/usr/bin/s390-koji
/usr/bin/stg-koji
/usr/share/doc/fedora-packager
/usr/share/doc/fedora-packager/AUTHORS
/usr/share/doc/fedora-packager/ChangeLog
/usr/share/doc/fedora-packager/TODO
/usr/share/licenses/fedora-packager
/usr/share/licenses/fedora-packager/COPYING

dustymabe commented 2 years ago

Anything need to change (i.e. files in either package that should be in the other)?