mirror of
https://git.rockylinux.org/staging/src/rocky-release.git
synced 2024-11-21 13:41:23 +00:00
use rltype for everything
This commit is contained in:
parent
f904857211
commit
5607c0ba4b
@ -26,7 +26,6 @@
|
||||
|
||||
%define contentdir pub/rocky
|
||||
%define sigcontent pub/sig
|
||||
%define rltype %{nil}
|
||||
%define rlosid rocky
|
||||
|
||||
%define os_bug_name Rocky-Linux-%{major}
|
||||
@ -38,8 +37,7 @@
|
||||
%if %{with rllookahead}
|
||||
%define minor 1
|
||||
%define contentdir pub/rocky-lh
|
||||
%define rltype lookahead
|
||||
%define rlpkg -lookahead
|
||||
%define rltype -lookahead
|
||||
%define rlstatement LookAhead
|
||||
%endif
|
||||
# End Rocky LookAhead Section
|
||||
@ -52,8 +50,7 @@
|
||||
# We do NOT override the minor version number here.
|
||||
%if %{with rlbeta}
|
||||
%define contentdir pub/rocky-beta
|
||||
%define rltype beta
|
||||
%define rlpkg -beta
|
||||
%define rltype -beta
|
||||
%define rlstatement Beta
|
||||
%endif
|
||||
# End Rocky Beta Section
|
||||
@ -85,7 +82,7 @@
|
||||
|
||||
# conditional section for future use
|
||||
|
||||
Name: rocky-release%{?rlpkg}
|
||||
Name: rocky-release%{?rltype}
|
||||
Version: %{full_release_version}
|
||||
Release: %{rocky_rel}%{dist}
|
||||
Summary: %{distro_name} release files
|
||||
@ -157,31 +154,31 @@ Source1403: rocky-signing.der
|
||||
%description
|
||||
%{distro_name} release files.
|
||||
|
||||
%package -n rocky-repos%{?rlpkg}
|
||||
%package -n rocky-repos%{?rltype}
|
||||
Summary: %{distro_name} Package Repositories
|
||||
License: %{rpm_license}
|
||||
Provides: system-repos = %{version}-%{release}
|
||||
Provides: rocky-repos(%{major}) = %{full_release_version}
|
||||
Requires: system-release = %{version}-%{release}
|
||||
Requires: rocky-gpg-keys%{?rlpkg}
|
||||
Requires: rocky-gpg-keys%{?rltype}
|
||||
Conflicts: %{name} < 8.0
|
||||
|
||||
%description -n rocky-repos%{?rlpkg}
|
||||
%description -n rocky-repos%{?rltype}
|
||||
%{distro_name} package repository files for yum/dnf
|
||||
|
||||
%package -n rocky-gpg-keys%{?rlpkg}
|
||||
%package -n rocky-gpg-keys%{?rltype}
|
||||
Summary: Rocky RPM GPG Keys
|
||||
Conflicts: %{name} < 8.0
|
||||
|
||||
%description -n rocky-gpg-keys%{?rlpkg}
|
||||
%description -n rocky-gpg-keys%{?rltype}
|
||||
This package provides the RPM signature keys for Rocky.
|
||||
|
||||
%package -n rocky-sb-certs%{?rlpkg}
|
||||
%package -n rocky-sb-certs%{?rltype}
|
||||
Summary: %{distro_name} public secureboot certificates
|
||||
Group: System Environment/Base
|
||||
Provides: system-sb-certs = %{version}-%{release}
|
||||
|
||||
%description -n rocky-sb-certs%{?rlpkg}
|
||||
%description -n rocky-sb-certs%{?rltype}
|
||||
This package contains the %{distro_name} secureboot public certificates.
|
||||
|
||||
%prep
|
||||
@ -349,7 +346,7 @@ install -p -m 0644 %{SOURCE1203} %{buildroot}%{_sysconfdir}/yum.repos.d/
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/dnf/vars
|
||||
echo "%{contentdir}" > %{buildroot}%{_sysconfdir}/dnf/vars/contentdir
|
||||
echo "%{sigcontent}" > %{buildroot}%{_sysconfdir}/dnf/vars/sigcontentdir
|
||||
echo "%{rltype}" > %{buildroot}%{_sysconfdir}/dnf/vars/rltype
|
||||
echo "%{?rltype}" > %{buildroot}%{_sysconfdir}/dnf/vars/rltype
|
||||
|
||||
# Copy out GPG keys
|
||||
install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
|
||||
@ -395,7 +392,7 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
|
||||
%{_prefix}/lib/sysctl.d/50-redhat.conf
|
||||
%{_mandir}/man1/rocky.1.gz
|
||||
|
||||
%files -n rocky-repos%{?rlpkg}
|
||||
%files -n rocky-repos%{?rltype}
|
||||
%license docs/LICENSE
|
||||
%config(noreplace) %{_sysconfdir}/yum.repos.d/rocky.repo
|
||||
%config(noreplace) %{_sysconfdir}/yum.repos.d/rocky-addons.repo
|
||||
@ -405,10 +402,10 @@ install -m 0644 %{SOURCE404} %{buildroot}/%{_prefix}/lib/sysctl.d/50-redhat.conf
|
||||
%config(noreplace) %{_sysconfdir}/dnf/vars/sigcontentdir
|
||||
%config(noreplace) %{_sysconfdir}/dnf/vars/rltype
|
||||
|
||||
%files -n rocky-gpg-keys%{?rlpkg}
|
||||
%files -n rocky-gpg-keys%{?rltype}
|
||||
%{_sysconfdir}/pki/rpm-gpg/
|
||||
|
||||
%files -n rocky-sb-certs%{?rlpkg}
|
||||
%files -n rocky-sb-certs%{?rltype}
|
||||
# care: resetting symlinks is intended
|
||||
%dir %{_sysconfdir}/pki/sb-certs
|
||||
%dir %{_datadir}/pki/sb-certs
|
||||
|
Loading…
Reference in New Issue
Block a user