push restructured spec

SPECS/rocky-release.spec

@@ -1,13 +1,3 @@
-# Note to packagers/builders:
-#
-# If you wish to build the LookAhead or Beta variant of this package, make sure
-# that you are setting --with=rlbeta or --with=rllookahead on your mock
-# command. See the README for more information.
-
-%bcond_with rlbeta
-%bcond_with rllookahead
-%bcond_with rloverride
-
 %define debug_package %{nil}
 
 # Product information
@@ -15,13 +5,13 @@
 %define variant_titlecase Server
 %define variant_lowercase server
 
-# Distribution Name and Version
+# Distribution Version Information
 %define distro_name  Rocky Linux
 %define distro       %{distro_name}
 %define distro_code  Red Quartz
 %define major        10
 %define minor        0
-%define rocky_rel    0%{?rllh:.%{rllh}}%{!?rllh:.18}
+%define rocky_rel    0.19
 %define rpm_license  BSD-3-Clause
 %define dist         .el%{major}
 %define home_url     https://rockylinux.org/
@@ -37,45 +27,6 @@
 %define os_bug_name  Rocky-Linux-%{major}
 %define support_end  2035-05-31
 
-################################################################################
-# Rocky LookAhead Section
-#
-# Reset defines for LookAhead variant. Default is stable if 0 or undefined.
-%if %{with rllookahead}
-%define minor        0
-%define contentdir   stg/rocky-lh
-%define rltype       -lookahead
-%define rlstatement  LookAhead
-%endif
-# End Rocky LookAhead Section
-################################################################################
-
-################################################################################
-# Rocky Beta Section
-#
-# Reset defines for Beta variant. Default is stable if 0 or undefined.
-# We do NOT override the minor version number here.
-%if %{with rlbeta}
-%define contentdir   stg/rocky-beta
-%define rltype       -beta
-%define rlstatement  Beta
-%endif
-# End Rocky Beta Section
-################################################################################
-
-################################################################################
-# Rocky Override Section
-#
-# Resets only the dist tag for the override package. All this does is ensure
-# that only the rhel macros and settings are provided - This is useful in the
-# case of a build that cannot be properly debranded (eg dotnet).
-%if %{with rloverride}
-%define dist         .el%{major}.override
-%define rlosid       rhel
-%endif
-# End Rocky Override Section
-################################################################################
-
 %define base_release_version %{major}
 %define dist_release_version %{major}
 %define full_release_version %{major}.%{minor}
@@ -217,12 +168,6 @@ Provides:       centos-sb-certs = %{version}-%{release}
 This package contains the %{distro_name} secureboot public certificates.
 
 %prep
-%if %{with rllookahead} && %{with rlbeta}
-echo "!! WARNING !!"
-echo "Both LookAhead and Beta were enabled. This is not supported."
-echo "As a result: BUILD FAILED."
-exit 1
-%endif
 echo Good.
 
 %build
@@ -300,6 +245,8 @@ cat > %{buildroot}%{_rpmmacrodir}/macros.dist << EOF
 %%dist_home_url       %{home_url}
 %%dist_bug_report_url %{bug_url}
 %%dist_debuginfod_url %{debug_url}
+
+#### End basic Rocky Linux macros
 EOF
 
 # Data directory
@@ -485,6 +432,9 @@ install -p -m 0644 %{SOURCE102} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/
 %{_datadir}/pki/sb-certs/*
 
 %changelog
+* Sat Sep 21 2024 Louis Abel <label@resf.org> - 10.0-0.19
+- Restructure spec file and remove unused macros
+
 * Tue Aug 13 2024 Louis Abel <label@resf.org> - 10.0-0.18
 - Enable rpcbind.service/socket