From 9e254fc9bb1ba5b9454ad59fb4d6186cfc67e375 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Mon, 29 Nov 2021 20:20:28 -0700 Subject: [PATCH] lh idea --- SPECS/rocky-release.spec | 1 - SPECS/rocky-release_with_lh.spec | 34 +++++++++++++++++++++----------- 2 files changed, 22 insertions(+), 13 deletions(-) diff --git a/SPECS/rocky-release.spec b/SPECS/rocky-release.spec index 80472ec..fc6404c 100644 --- a/SPECS/rocky-release.spec +++ b/SPECS/rocky-release.spec @@ -57,7 +57,6 @@ Provides: centos-release-eula = %{version}-%{release} # What are our requirements? Requires: rocky-repos(%{major}) -Recommends: rocky-release-eula # GPG Keys (100-199) Source101: RPM-GPG-KEY-rocky-%{major} diff --git a/SPECS/rocky-release_with_lh.spec b/SPECS/rocky-release_with_lh.spec index 7fd8faf..81806ca 100644 --- a/SPECS/rocky-release_with_lh.spec +++ b/SPECS/rocky-release_with_lh.spec @@ -16,6 +16,11 @@ %define contentdir pub/rocky %define rltype stable +################################################################################ +# Rocky LookAhead Section +# +# Note to Packagers/Builders: If you wish to enable this, rllh should be +# defined as "lookahead" # Check for lookahead and reset defines - This ensures a "lookahead" system # will contact the mirrors or set the baseurl to properly use Rocky LookAhead, # otherwise, the default is "stable" @@ -25,6 +30,8 @@ %define rltype lookahead %define rlstatement " (LookAhead) " %endif +# End Rocky LookAhead Section +################################################################################ %define base_release_version %{major} %define dist_release_version %{major} @@ -37,10 +44,13 @@ # Avoids a weird anaconda problem %global __requires_exclude_from %{_libexecdir} -Name: rocky-release +# conditional section for future use + +Name: rocky-release%{?rllh:-lookahead} Version: %{major}.%{minor} Release: %{rocky_rel}.el%{major} Summary: %{distro_name} release files +Group: System Environment/Base License: %{rpm_license} URL: https://rockylinux.org BuildArch: noarch @@ -59,15 +69,15 @@ Provides: centos-release(upstream) = %{full_release_version} Provides: base-module(platform:el%{major}) ## This makes lorax/pungi/anaconda happy -Provides: rocky-release-eula -Provides: redhat-release-eula -Provides: centos-release-eula +Provides: rocky-release-eula = %{version}-%{release} +Provides: redhat-release-eula = %{version}-%{release} +Provides: centos-release-eula = %{version}-%{release} # What are our requirements? Requires: rocky-repos(%{major}) # GPG Keys (100-199) -#Source101: RPM-GPG-KEY-rocky-%{major} +Source101: RPM-GPG-KEY-rocky-%{major} Source102: RPM-GPG-KEY-rockytesting # Release Sources (200-399) @@ -107,7 +117,7 @@ Source1300: rocky.1.gz %description %{distro_name} release files. -%package -n rocky-repos +%package -n rocky-repos%{?rllh:-lookahead} Summary: %{distro_name} Package Repositories License: %{rpm_license} Provides: rocky-repos(%{major}) = %{full_release_version} @@ -115,22 +125,22 @@ Requires: system-release = %{full_release_version} Requires: rocky-gpg-keys Conflicts: %{name} < 8.0 -%description -n rocky-repos +%description -n rocky-repos%{?rllh:-lookahead} %{distro_name} package repository files for yum/dnf -%package -n rocky-gpg-keys +%package -n rocky-gpg-keys%{?rllh:-lookahead} Summary: Rocky RPM GPG Keys Conflicts: %{name} < 8.0 -%description -n rocky-gpg-keys +%description -n rocky-gpg-keys%{?rllh:-lookahead} This package provides the RPM signature keys for Rocky. -%package -n rocky-sb-certs +%package -n rocky-sb-certs%{?rllh:-lookahead} Summary: %{distro_name} public secureboot certificates Group: System Environment/Base Provides: system-sb-certs = %{version}-%{release} -%description -n rocky-sb-certs +%description -n rocky-sb-certs%{?rllh:-lookahead} This package contains the %{distro_name} secureboot public certificates. %prep @@ -164,7 +174,7 @@ ID="rocky" ID_LIKE="rhel centos fedora" VERSION_ID="%{full_release_version}" PLATFORM_ID="platform:el%{major}" -PRETTY_NAME="%{distro_name} %{full_release_version} (%{distro_code})" +PRETTY_NAME="%{distro_name} %{full_release_version} (%{distro_code})%{?rlstatement}" ANSI_COLOR="0;32" CPE_NAME="cpe:/o:rocky:rocky:%{full_release_version}:GA" HOME_URL="https://rockylinux.org/"