a10-beta-test #5

Merged
alukoshko merged 5 commits from a10-beta-test into a10-beta 2024-07-02 11:51:45 +00:00
Showing only changes of commit 7c772d5bbf - Show all commits

View File

@ -2,7 +2,6 @@
# Also baseurl for regular repos should be changed to repo.almalinux.org # Also baseurl for regular repos should be changed to repo.almalinux.org
# and mirrorlist should be set as default # and mirrorlist should be set as default
%bcond_without beta %bcond_without beta
%bcond_with bootstrap
# Needs only for first build, because we should have right arch names # Needs only for first build, because we should have right arch names
%if 0%{?x86_64_v2} == 1 %if 0%{?x86_64_v2} == 1
@ -93,7 +92,6 @@ Source512: almalinux-beta.repo
Source600: RPM-GPG-KEY-AlmaLinux-10 Source600: RPM-GPG-KEY-AlmaLinux-10
%if %{without bootstrap}
%package -n almalinux-sb-certs %package -n almalinux-sb-certs
Summary: %{distro} public secureboot certificates Summary: %{distro} public secureboot certificates
Group: System Environment/Base Group: System Environment/Base
@ -108,12 +106,10 @@ Requires: almalinux-gpg-keys = %{version}-%{release}
%package -n almalinux-gpg-keys %package -n almalinux-gpg-keys
Summary: %{distro} RPM keys Summary: %{distro} RPM keys
%endif
%description %description
%{distro} release files. %{distro} release files.
%if %{without bootstrap}
%description -n almalinux-sb-certs %description -n almalinux-sb-certs
%{distro} secureboot certificates %{distro} secureboot certificates
@ -122,7 +118,6 @@ This package provides the package repository files for %{distro}.
%description -n almalinux-gpg-keys %description -n almalinux-gpg-keys
This package provides the RPM signature keys for %{distro}. This package provides the RPM signature keys for %{distro}.
%endif
%install %install
# copy license and contributors doc here for %%license and %%doc macros # 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 mkdir %{buildroot}%{_sysconfdir}/yum.repos.d
touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo touch %{buildroot}%{_sysconfdir}/yum.repos.d/redhat.repo
%if %{without bootstrap}
# Copy secureboot certificates # Copy secureboot certificates
install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/sb-certs/ install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/sb-certs/
install -d -m 0755 %{buildroot}%{_datadir}/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 # copy GPG keys
install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg install -d -m 0755 %{buildroot}%{_sysconfdir}/pki/rpm-gpg
install -p -m 0644 %{SOURCE600} %{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 # These variables should be set in the build environment to change rpm names
%if 0%{?x86_64_v2} == 1 %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 %config(noreplace) %{_sysconfdir}/rpm/macros.arch_v2
%endif %endif
%if %{without bootstrap}
%files -n almalinux-sb-certs %files -n almalinux-sb-certs
# Note to future packagers: # Note to future packagers:
# resetting the symlinks in /etc/pki/sb-certs on upgrade is the intended behavior here # 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 %files -n almalinux-gpg-keys
%{_sysconfdir}/pki/rpm-gpg %{_sysconfdir}/pki/rpm-gpg
%endif
%changelog %changelog
* Tue Jul 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.14 * Tue Jul 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.14