separate eula from primary package

This commit is contained in:
nazunalika 2021-11-29 19:37:33 -07:00
parent 7ddd15aa07
commit 559386605b
Signed by: label
GPG Key ID: 6735C0E1BD65D048
2 changed files with 56 additions and 16 deletions

View File

@ -0,0 +1,29 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBGAof3sBEAC50QnXSLxhE+n0gZkX5d5zyBO+SyblfEye9KGf/nMFRu0nPnhO
y0WlkP40fg2di9iKlTtvIWJfxs2+7PqA9wcU4vnXJpF5MIGurmDKRhBG07v8zMCg
aU99c9SWQ+76FvomoVzdfj5sSYHfcqD7gRm6VeUlmVv1twqXBm9bfIIF/skXBS9Y
Gld1py9zSzWgjkT2fUukV9P9FaUuWu6Sbz4wD/Gr+zaSbobonH7zcQjAMbNuJgD1
diRL7kS+K8QPEPN94IrWJyFegjRzed0e6FAAHqx2Qlrd/09/Tvlxi+yr7A+FpkjF
41LWg58MZ78letMqgLJI84Ui5ZqUUNJlOF2likQo85yIUV4shlKSgrVd1xC76pxm
yLWPxcluyS9AdD1tNqW+vIAcQX7V6WY0Pg4A7rAqi+hhXLNwuckPoOGWkkcMIfXH
ykHsNp9S7YFqi5QdNaw5NciVHIJWXfgDTyGHf+IPNe5HKZJHU+HAmdoPAO7dSWyZ
tUDLNog+ssvoIcLz8ZzODS2WO9DsiJ0U7qZen+erto+fri17fHi3mRXGApnAWoBM
1eTWbXk3xV2q4Xcst9buCAWWoX1G7XYtjAKNLJ6w6HoN4nN+yyot6fNdd8nLEXCR
huPM1gtRqUj6qpTxcUqSRsyb7wE34N+XO1OE9WUJMDauJLhllYhZqbRBSwARAQAB
tDNSZWxlYXNlIEVuZ2luZWVyaW5nIDxpbmZyYXN0cnVjdHVyZUByb2NreWxpbnV4
Lm9yZz6JAk4EEwEIADgWIQQJGkQEfD2LejMfXhhUieQru+LBCAUCYCh/ewIbDwUL
CQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBUieQru+LBCMVvD/0cJzEtybgN7hPW
ZHwOVmc0ovgHHpsKJJjY6XpmEqTbPhGiq7ZklxMweHh3MBWymcGaJJZH+8HIwGfD
m1DrhllJ4ddSz4y27fqbwfuRLx4BexwanxHN2jfp1q2E8KhAbtJYuZHEsChZHGI7
JCbKYr3h0wat2GSZ9oM2Bc79hoJ73h73nXKLQrGwkRP52RxJA23sSwJp408tPi++
3kaScIF9Ji+jkXIgX9yCzrBAxmn4r0qOO8x/F/m1xDmLVwRdvKBNvtA9xOH4tQco
rGu11sDvB6WdlNYyA2yFjbHBPexTBLLovNq45jT7o6DkZyj1ej7D5xXfE7nOA1KF
sGxoT0Xo1GekIkF17A3EPl8ijw3PJcfF99s+NFE5z9PK5V2nRSelv3AfiL89iIZG
wcCqRijg/DxWQPNP952wow1MRWZKd6cSFejS+sKYJueH9IVkxxIPr0YRQQi3BD6I
93Fug8dTLWE6QSIOlrMcvXQZhty57b0WEOzVRLF8j46KOqEN4w3CrrJ3iFKR2ksX
YeK0Lz+Zm6gVmEgADkLHamQxEU8KQLsLhYh42/qbBicBXjQ7Zt6Y4Y48cUzThfaK
p0Iy+QGxbC0LMpmnx8arnOh0QLxGkEnCNggoupQI3ql+QYoUA+k0FUlv3lHC1vY8
sdkkxYa8srjZAmmaO+RoMqB1P38URg==
=kXX3
-----END PGP PUBLIC KEY BLOCK-----

View File

@ -8,17 +8,17 @@
# Distribution Name and Version # Distribution Name and Version
%define distro_name Rocky Linux %define distro_name Rocky Linux
%define distro_code Blue Onyx %define distro_code Blue Onyx
%define major 9 %define major 9
%define minor 0 %define minor 0
%define rocky_rel 1.2 %define rocky_rel 1.2
%define rpm_license BSD-3-Clause %define rpm_license BSD-3-Clause
%define contentdir pub/rocky
%define base_release_version %{major} %define base_release_version %{major}
%define dist_release_version %{major} %define dist_release_version %{major}
%define full_release_version %{major}.%{minor} %define full_release_version %{major}.%{minor}
%define contentdir pub/rocky
%ifarch ppc64le %ifarch ppc64le
%define tuned_profile :server %define tuned_profile :server
%endif %endif
@ -32,6 +32,7 @@ Name: rocky-release
Version: %{major}.%{minor} Version: %{major}.%{minor}
Release: %{rocky_rel}.el%{major} Release: %{rocky_rel}.el%{major}
Summary: %{distro_name} release files Summary: %{distro_name} release files
Group: System Environment/Base
License: %{rpm_license} License: %{rpm_license}
URL: https://rockylinux.org URL: https://rockylinux.org
BuildArch: noarch BuildArch: noarch
@ -49,16 +50,12 @@ Provides: centos-release(upstream) = %{full_release_version}
## Required by libdnf ## Required by libdnf
Provides: base-module(platform:el%{major}) Provides: base-module(platform:el%{major})
## This makes lorax/pungi/anaconda happy
Provides: rocky-release-eula
Provides: redhat-release-eula
Provides: centos-release-eula
# What are our requirements? # What are our requirements?
Requires: rocky-repos(%{major}) Requires: rocky-repos(%{major})
Recommends: rocky-release-eula
# GPG Keys (100-199) # GPG Keys (100-199)
#Source101: RPM-GPG-KEY-rocky-%{major} Source101: RPM-GPG-KEY-rocky-%{major}
Source102: RPM-GPG-KEY-rockytesting Source102: RPM-GPG-KEY-rockytesting
# Release Sources (200-399) # Release Sources (200-399)
@ -96,10 +93,22 @@ Source1300: rocky.1.gz
# rocky secureboot certs placeholder (1400-1499) # rocky secureboot certs placeholder (1400-1499)
%package eula
Summary: %{product_family} EULA File
Group: System Environment/Base
License: Not Applicable
Provides: rocky-release-eula = %{version}-%{release}
Provides: redhat-release-eula = %{version}-%{release}
Provides: centos-release-eula = %{version}-%{release}
Conflicts: %{name} < 8.0
%description eula
%{product_family} EULA File
%description %description
%{distro_name} release files. %{distro_name} release files.
%package -n rocky-repos %package -n rocky-repos
Summary: %{distro_name} Package Repositories Summary: %{distro_name} Package Repositories
License: %{rpm_license} License: %{rpm_license}
Provides: rocky-repos(%{major}) = %{full_release_version} Provides: rocky-repos(%{major}) = %{full_release_version}
@ -110,14 +119,14 @@ Conflicts: %{name} < 8.0
%description -n rocky-repos %description -n rocky-repos
%{distro_name} package repository files for yum/dnf %{distro_name} package repository files for yum/dnf
%package -n rocky-gpg-keys %package -n rocky-gpg-keys
Summary: Rocky RPM GPG Keys Summary: Rocky RPM GPG Keys
Conflicts: %{name} < 8.0 Conflicts: %{name} < 8.0
%description -n rocky-gpg-keys %description -n rocky-gpg-keys
This package provides the RPM signature keys for Rocky. This package provides the RPM signature keys for Rocky.
%package -n rocky-sb-certs %package -n rocky-sb-certs
Summary: %{distro_name} public secureboot certificates Summary: %{distro_name} public secureboot certificates
Group: System Environment/Base Group: System Environment/Base
Provides: system-sb-certs = %{version}-%{release} Provides: system-sb-certs = %{version}-%{release}
@ -290,14 +299,16 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
%config(noreplace) %{_sysconfdir}/issue.net %config(noreplace) %{_sysconfdir}/issue.net
%dir %{_sysconfdir}/issue.d %dir %{_sysconfdir}/issue.d
%{_sysconfdir}/rpm/macros.dist %{_sysconfdir}/rpm/macros.dist
%{_datadir}/redhat-release
%{_datadir}/rocky-release
%{_prefix}/lib/os-release %{_prefix}/lib/os-release
%{_prefix}/lib/systemd/system-preset/* %{_prefix}/lib/systemd/system-preset/*
%{_prefix}/lib/systemd/user-preset/* %{_prefix}/lib/systemd/user-preset/*
%{_prefix}/lib/sysctl.d/50-redhat.conf %{_prefix}/lib/sysctl.d/50-redhat.conf
%{_mandir}/man1/rocky.1.gz %{_mandir}/man1/rocky.1.gz
%files eula
%{_datadir}/redhat-release
%{_datadir}/rocky-release
%files -n rocky-repos %files -n rocky-repos
%license docs/LICENSE %license docs/LICENSE
%config(noreplace) %{_sysconfdir}/yum.repos.d/Rocky-*.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/Rocky-*.repo