From d8a303c5d62bfdba6ba490b54b3fef966d055e624e5b941dca3809c960e98494 Mon Sep 17 00:00:00 2001 From: Max Lin Date: Fri, 14 Nov 2025 17:31:57 +0800 Subject: [PATCH] Fix a broken macro definition in macros.leap --- 000release-packages/Leap-release.changes | 9 +++++++++ 000release-packages/Leap-release.spec | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/000release-packages/Leap-release.changes b/000release-packages/Leap-release.changes index 31ea5f2..99476d7 100644 --- a/000release-packages/Leap-release.changes +++ b/000release-packages/Leap-release.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Nov 14 09:25:59 UTC 2025 - Yuchen Lin + +- Tweak macros.leap bsc#1238724 + * Drop %sle_version macro definition from the macros.leap + * Add %is_opensuse macro definition from the macros.leap +- Add a particular hook to the version number hence the new one + will be selected over than other competitor + ------------------------------------------------------------------- Mon Sep 01 22:36:02 UTC 2025 - openSUSE diff --git a/000release-packages/Leap-release.spec b/000release-packages/Leap-release.spec index 7379d22..da3d579 100644 --- a/000release-packages/Leap-release.spec +++ b/000release-packages/Leap-release.spec @@ -22,8 +22,10 @@ %define betaversion %{nil} %define codename Leap %define obsoleted_codename openSUSE +%define theme_ver +leap + Name: Leap-release -Version: 16.0 +Version: 16.0%{theme_ver} Release: 0 Provides: aaa_version Provides: distribution-release @@ -376,7 +378,7 @@ echo "# RPM macros to identify Leap distribution" >> $RPM_BUILD_ROOT/etc/rpm/mac echo "#" >> $RPM_BUILD_ROOT/etc/rpm/macros.leap echo "#==================================================" >> $RPM_BUILD_ROOT/etc/rpm/macros.leap echo "" >> $RPM_BUILD_ROOT/etc/rpm/macros.leap -echo "%%sle_version %sle_version" >> $RPM_BUILD_ROOT/etc/rpm/macros.leap +echo "%%is_opensuse %is_opensuse" >> $RPM_BUILD_ROOT/etc/rpm/macros.leap # enable vendor change openSUSE,SUSE mkdir -p %{buildroot}%{_sysconfdir}/zypp/vendors.d -- 2.51.1