rpms/almalinux-release
6
2
Fork 2
Code Issues Pull Requests Releases Activity

- Update os-release

Browse Source 
- Stop enabling systemd-resolved
This commit is contained in:
eabdullin 2024-08-13 17:44:14 +03:00
parent 79db6ac382
commit 5dc718541c
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SOURCES/90-default.preset
View File

@ -8,9 +8,6 @@ disable systemd-networkd-wait-online.service
# We want to update systemd-boot from packaging scriptlets after updates. # We want to update systemd-boot from packaging scriptlets after updates.
disable systemd-boot-update.service disable systemd-boot-update.service
# https://fedoraproject.org/wiki/Changes/systemd-resolved
enable systemd-resolved.service
# https://fedoraproject.org/wiki/Changes/EnableSystemdOomd # https://fedoraproject.org/wiki/Changes/EnableSystemdOomd
enable systemd-oomd.service enable systemd-oomd.service
@ -466,4 +463,3 @@ enable cockpit.socket
# https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault # https://fedoraproject.org/wiki/Changes/EnableFwupdRefreshByDefault
enable fwupd-refresh.timer enable fwupd-refresh.timer

29
SPECS/almalinux-release.spec
View File

@ -3,17 +3,16 @@
# and mirrorlist should be set as default # and mirrorlist should be set as default
%bcond_without beta %bcond_without beta
%global distro AlmaLinux %global distro AlmaLinux Preview
%global release_name Seafoam Ocelot
%global major 10 %global major 10
%global minor 0 %global minor 0
# %%global eol_date 2035-06-01 # %%global eol_date 2035-06-01
Name: almalinux-release Name: almalinux-release
Version: %{major}.%{minor} Version: %{major}.%{minor}
Release: 0.14%{?dist} Release: 0.17.1%{?dist}
Summary: %{distro} release files Summary: %{distro} release files
License: GPLv2 License: GPL-2.0-or-later
URL: https://almalinux.org URL: https://almalinux.org
Provides: centos-release = %{version}-%{release} Provides: centos-release = %{version}-%{release}
@ -108,7 +107,7 @@ cp %{SOURCE201} ./docs
# create /etc/system-release and /etc/redhat-release # create /etc/system-release and /etc/redhat-release
install -d -m 0755 %{buildroot}%{_sysconfdir} 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}/system-release
ln -s almalinux-release %{buildroot}%{_sysconfdir}/redhat-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 # Create the os-release file
install -d -m 0755 %{buildroot}%{_prefix}/lib install -d -m 0755 %{buildroot}%{_prefix}/lib
cat > %{buildroot}%{_prefix}/lib/os-release << EOF cat > %{buildroot}%{_prefix}/lib/os-release << EOF
NAME="%{distro}" NAME="%{dist_name}"
VERSION="%{major}.%{minor} (%{release_name})" VERSION="%{major}"
ID="almalinux" ID="almalinux"
ID_LIKE="rhel centos fedora" ID_LIKE="rhel centos fedora"
VERSION_ID="%{major}.%{minor}" VERSION_ID="%{major}"
PLATFORM_ID="platform:el%{major}" PLATFORM_ID="platform:el%{major}"
PRETTY_NAME="%{distro} %{major}.%{minor}%{?beta: %{beta}} (%{release_name})" PRETTY_NAME="%{distro} %{major}"
ANSI_COLOR="0;34" ANSI_COLOR="0;34"
LOGO="fedora-logo-icon" LOGO="fedora-logo-icon"
CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos" CPE_NAME="cpe:/o:almalinux:almalinux:%{major}::baseos"
HOME_URL="%{dist_home_url}" HOME_URL="%{dist_home_url}"
DOCUMENTATION_URL="https://wiki.almalinux.org/" DOCUMENTATION_URL="https://wiki.almalinux.org/"
VENDOR_NAME="Almalinux"
VENDOR_URL="%{dist_home_url}"
BUG_REPORT_URL="%{dist_bug_report_url}" BUG_REPORT_URL="%{dist_bug_report_url}"
ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}" ALMALINUX_MANTISBT_PROJECT="AlmaLinux-%{major}"
ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}.%{minor}" ALMALINUX_MANTISBT_PROJECT_VERSION="%{major}"
REDHAT_SUPPORT_PRODUCT="%{distro}" REDHAT_SUPPORT_PRODUCT="AlmaLinux"
REDHAT_SUPPORT_PRODUCT_VERSION="%{major}.%{minor}%{?beta: %{beta}}" REDHAT_SUPPORT_PRODUCT_VERSION="%{major}"
EOF EOF
# Should be added to os-release in the future # 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 %{_sysconfdir}/pki/rpm-gpg
%changelog %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 * Tue Jul 02 2024 Eduard Abdullin <eabdullin@almalinux.org> - 10.0-0.14
- AlmaLinux 10 beta release - AlmaLinux 10 beta release