From d52b4c2ba5a7166d7ec73a19ba9d4a977c258358 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Sat, 19 Nov 2022 03:39:41 +0100 Subject: [PATCH 1/2] Fixed ownership of dirs (albz#328) --- almalinux-release.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/almalinux-release.spec b/almalinux-release.spec index e02f5b8..a6acbcb 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -8,7 +8,7 @@ %define dist_release_version 8 %define upstream_rel_long 8.7-0.3 %define upstream_rel 8.7 -%define almalinux_rel 2 +%define almalinux_rel 3 %define dist .el%{dist_release_version} # The anaconda scripts in %%{_libexecdir} can create false requirements @@ -180,7 +180,7 @@ rm -rf %{buildroot} ##/etc/centos-release-upstream /etc/almalinux-release /etc/almalinux-release-upstream -/etc/dnf/ +/etc/dnf/vars/* /etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux %config(noreplace) /etc/yum.repos.d/almalinux.repo %config(noreplace) /etc/yum.repos.d/almalinux-ha.repo @@ -199,13 +199,16 @@ rm -rf %{buildroot} %config(noreplace) /etc/issue.net /etc/rpm/macros.dist %{_docdir}/redhat-release -%{_docdir}/almalinux-release/* +%{_docdir}/almalinux-release %{_datadir}/redhat-release -%{_datadir}/almalinux-release/* +%{_datadir}/almalinux-release %{_prefix}/lib/os-release %{_prefix}/lib/systemd/system-preset/* %changelog +* Sat Nov 19 2022 Andrew Lukoshko - 8.7-3 +- Fixed ownership of dirs (albz#328) + * Wed Nov 09 2022 Andrew Lukoshko - 8.7-2 - Add stream dnf variable for CentOS SIG repos compatibility From a295ba5122dd09e9a342ab2757245a030d2c8080 Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Tue, 16 May 2023 14:05:11 +0200 Subject: [PATCH 2/2] 8.8 stable release --- 90-default.preset | 2 +- almalinux-release.spec | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/90-default.preset b/90-default.preset index 7b67ab3..4e5d530 100644 --- a/90-default.preset +++ b/90-default.preset @@ -195,5 +195,5 @@ enable dbus-daemon.service # https://bugzilla.redhat.com/show_bug.cgi?id=1967515 enable nfs-client.target -# https://bugzilla.redhat.com/show_bug.cgi?id=2106814 +# https://bugzilla.redhat.com/show_bug.cgi?id=2126605 enable clevis-luks-askpass.path diff --git a/almalinux-release.spec b/almalinux-release.spec index a6acbcb..d3a7ece 100644 --- a/almalinux-release.spec +++ b/almalinux-release.spec @@ -1,14 +1,14 @@ %define debug_package %{nil} %define product_family AlmaLinux -%define release_name Stone Smilodon +%define release_name Sapphire Caracal %define contentdir almalinux %define infra_var stock %define base_release_version 8 -%define full_release_version 8.7 +%define full_release_version 8.8 %define dist_release_version 8 -%define upstream_rel_long 8.7-0.3 -%define upstream_rel 8.7 -%define almalinux_rel 3 +%define upstream_rel_long 8.8-0.8 +%define upstream_rel 8.8 +%define almalinux_rel 1 %define dist .el%{dist_release_version} # The anaconda scripts in %%{_libexecdir} can create false requirements @@ -206,6 +206,9 @@ rm -rf %{buildroot} %{_prefix}/lib/systemd/system-preset/* %changelog +* Tue May 16 2023 Andrew Lukoshko - 8.8-1 +- 8.8 stable release + * Sat Nov 19 2022 Andrew Lukoshko - 8.7-3 - Fixed ownership of dirs (albz#328)