From 7c772d5bbfb194505ec5d0e5a65c22d76e0b503b Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 2 Jul 2024 13:39:36 +0300 Subject: [PATCH] Remove bootstreap var --- SPECS/almalinux-release.spec | 9 --------- 1 file changed, 9 deletions(-) diff --git a/SPECS/almalinux-release.spec b/SPECS/almalinux-release.spec index 3e0b769..8120579 100644 --- a/SPECS/almalinux-release.spec +++ b/SPECS/almalinux-release.spec @@ -2,7 +2,6 @@ # Also baseurl for regular repos should be changed to repo.almalinux.org # and mirrorlist should be set as default %bcond_without beta -%bcond_with bootstrap # Needs only for first build, because we should have right arch names %if 0%{?x86_64_v2} == 1 @@ -93,7 +92,6 @@ Source512: almalinux-beta.repo Source600: RPM-GPG-KEY-AlmaLinux-10 -%if %{without bootstrap} %package -n almalinux-sb-certs Summary: %{distro} public secureboot certificates Group: System Environment/Base @@ -108,12 +106,10 @@ Requires: almalinux-gpg-keys = %{version}-%{release} %package -n almalinux-gpg-keys Summary: %{distro} RPM keys -%endif %description %{distro} release files. -%if %{without bootstrap} %description -n almalinux-sb-certs %{distro} secureboot certificates @@ -122,7 +118,6 @@ This package provides the package repository files for %{distro}. %description -n almalinux-gpg-keys This package provides the RPM signature keys for %{distro}. -%endif %install # copy license and contributors doc here for %%license and %%doc macros @@ -242,7 +237,6 @@ install -m 0644 %{SOURCE304} %{buildroot}/%{_prefix}/lib/sysctl.d/ mkdir %{buildroot}%{_sysconfdir}/yum.repos.d touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo -%if %{without bootstrap} # Copy secureboot certificates install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/sb-certs/ install -d -m 0755 %{buildroot}%{_datadir}/pki/sb-certs/ @@ -326,7 +320,6 @@ echo "%{major}-stream" > %{buildroot}%{_sysconfdir}/dnf/vars/stream # copy GPG keys install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg install -p -m 0644 %{SOURCE600} %{buildroot}%{_sysconfdir}/pki/rpm-gpg/ -%endif # These variables should be set in the build environment to change rpm names %if 0%{?x86_64_v2} == 1 @@ -365,7 +358,6 @@ echo '%x86_64_fp 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_fp %config(noreplace) %{_sysconfdir}/rpm/macros.arch_v2 %endif -%if %{without bootstrap} %files -n almalinux-sb-certs # Note to future packagers: # resetting the symlinks in /etc/pki/sb-certs on upgrade is the intended behavior here @@ -396,7 +388,6 @@ echo '%x86_64_fp 1' >> %{buildroot}%{_sysconfdir}/rpm/macros.arch_fp %files -n almalinux-gpg-keys %{_sysconfdir}/pki/rpm-gpg -%endif %changelog * Tue Jul 02 2024 Eduard Abdullin - 10.0-0.14