From 5dc718541cc6618215547dd569c180690d4ad733 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Tue, 13 Aug 2024 17:44:14 +0300
Subject: [PATCH] - Update os-release - Stop enabling systemd-resolved

---
 SOURCES/90-default.preset    |  4 ----
 SPECS/almalinux-release.spec | 29 +++++++++++++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/SOURCES/90-default.preset b/SOURCES/90-default.preset
index af3d4c7..5e0f5e7 100644
--- a/SOURCES/90-default.preset
+++ b/SOURCES/90-default.preset
@@ -8,9 +8,6 @@ disable systemd-networkd-wait-online.service
 # We want to update systemd-boot from packaging scriptlets after updates.
 disable systemd-boot-update.service
 
-# https://fedoraproject.org/wiki/Changes/systemd-resolved
-enable systemd-resolved.service
-
 # https://fedoraproject.org/wiki/Changes/EnableSystemdOomd
 enable systemd-oomd.service
 
@@ -466,4 +463,3 @@ enable cockpit.socket
 
 # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
 enable fwupd-refresh.timer
-
diff --git a/SPECS/almalinux-release.spec b/SPECS/almalinux-release.spec
index 9454b03..c5341bf 100644
--- a/SPECS/almalinux-release.spec
+++ b/SPECS/almalinux-release.spec
@@ -3,17 +3,16 @@
 # and mirrorlist should be set as default
 %bcond_without beta
 
-%global distro  AlmaLinux
-%global release_name Seafoam Ocelot
+%global distro  AlmaLinux Preview
 %global major   10
 %global minor   0
 # %%global eol_date 2035-06-01
 
 Name:           almalinux-release
 Version:        %{major}.%{minor}
-Release:        0.14%{?dist}
+Release:        0.17.1%{?dist}
 Summary:        %{distro} release files
-License:        GPLv2
+License:        GPL-2.0-or-later
 URL:            https://almalinux.org
 
 Provides:       centos-release = %{version}-%{release}
@@ -108,7 +107,7 @@ cp %{SOURCE201} ./docs
 
 # create /etc/system-release and /etc/redhat-release
 install -d -m 0755 %{buildroot}%{_sysconfdir}
-echo "%{distro} release %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" > %{buildroot}%{_sysconfdir}/almalinux-release
+echo "%{distro} release %{major}" > %{buildroot}%{_sysconfdir}/almalinux-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/system-release
 ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 
@@ -139,24 +138,26 @@ ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-release
 # Create the os-release file
 install -d -m 0755 %{buildroot}%{_prefix}/lib
 cat > %{buildroot}%{_prefix}/lib/os-release << EOF
-NAME="%{distro}"
-VERSION="%{major}.%{minor} (%{release_name})"
+NAME="%{dist_name}"
+VERSION="%{major}"
 ID="almalinux"
 ID_LIKE="rhel centos fedora"
-VERSION_ID="%{major}.%{minor}"
+VERSION_ID="%{major}"
 PLATFORM_ID="platform:el%{major}"
-PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} (%{release_name})"
+PRETTY_NAME="%{distro} %{major}"
 ANSI_COLOR="0;34"
 LOGO="fedora-logo-icon"
 CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
 HOME_URL="%{dist_home_url}"
 DOCUMENTATION_URL="https://wiki.almalinux.org/"
+VENDOR_NAME="Almalinux"
+VENDOR_URL="%{dist_home_url}"
 BUG_REPORT_URL="%{dist_bug_report_url}"
 
 ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}"
-ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}.%{minor}"
-REDHAT_SUPPORT_PRODUCT="%{distro}"
-REDHAT_SUPPORT_PRODUCT_VERSION="%{major}.%{minor}%{?beta: %{beta}}"
+ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}"
+REDHAT_SUPPORT_PRODUCT="AlmaLinux"
+REDHAT_SUPPORT_PRODUCT_VERSION="%{major}"
 EOF
 
 # Should be added to os-release in the future
@@ -365,5 +366,9 @@ echo '%%_target_platform x86_64-%%{_vendor}-%%{_target_os}%%{?_gnu}' >> %{buildr
 %{_sysconfdir}/pki/rpm-gpg
 
 %changelog
+* Tue Aug 13 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.17.1
+- Update os-release
+- Stop enabling systemd-resolved
+
 * Tue Jul 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.14
 - AlmaLinux 10 beta release