From 33633ab229f6e2db76aa6c7fa81ff8367a1c688d Mon Sep 17 00:00:00 2001 From: ZhouWeitao Date: Tue, 25 Jan 2022 16:21:01 +0800 Subject: [PATCH 1/2] use var releasever instead of hardcode in repo baseurl This reverts commit c45e30128612232dcc55a965ce9d59a7a4bc20b8. Signed-off-by: ZhouWeitao --- anolis-release.spec | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/anolis-release.spec b/anolis-release.spec index 0c4a770..49f7154 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -1,4 +1,4 @@ -%define anolis_release 6 +%define anolis_release 7 %define debug_package %{nil} %define product_family Anolis OS @@ -116,17 +116,6 @@ install -m 644 %{SOURCE106} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE107} %{buildroot}/etc/yum.repos.d install -m 644 %{SOURCE108} %{buildroot}/etc/yum.repos.d -# Edit the yum repo url to point to the distro's RPMs repo. -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-BaseOS.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-AppStream.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-PowerTools.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-Plus.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-DDE.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-Source.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-Debuginfo.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-HighAvailability.repo -sed -i 's/\$releasever/%{full_release_version}/g' %{buildroot}/etc/yum.repos.d/AnolisOS-Extras.repo - # set up the dist tag macros install -d -m 755 %{buildroot}/etc/rpm cat >> %{buildroot}/etc/rpm/macros.dist << EOF @@ -178,6 +167,9 @@ rm -rf %{buildroot} /etc/pki/rpm-gpg/ %changelog +* Tue Jan 25 2022 Weitao Zhou - 8.4-7 +- Use var releasever instead of hardcode in repo baseurl + * Mon Oct 11 2021 Liwei Ge - 8.4-6 - Update license to MulanPSLv2 - Translate EULA to Chinese -- Gitee From f7601e6ba702765b3afa3847c79489acac394e10 Mon Sep 17 00:00:00 2001 From: ZhouWeitao Date: Tue, 25 Jan 2022 17:33:33 +0800 Subject: [PATCH 2/2] Update to 8.5 Signed-off-by: ZhouWeitao --- anolis-release.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/anolis-release.spec b/anolis-release.spec index 49f7154..ff86851 100644 --- a/anolis-release.spec +++ b/anolis-release.spec @@ -1,9 +1,9 @@ -%define anolis_release 7 +%define anolis_release 1 %define debug_package %{nil} %define product_family Anolis OS %define base_release_version 8 -%define full_release_version 8.4 +%define full_release_version 8.5 %define compat_release_version 8 %define dist .an%{base_release_version} @@ -167,6 +167,9 @@ rm -rf %{buildroot} /etc/pki/rpm-gpg/ %changelog +* Tue Jan 25 2022 Weitao Zhou - 8.5-1 +- Update to 8.5 + * Tue Jan 25 2022 Weitao Zhou - 8.4-7 - Use var releasever instead of hardcode in repo baseurl -- Gitee