Fix a broken macro definition in macros.leap bsc#1238724 #47

Manually merged
openSUSE merged 1 commits from maxlin_factory/Leap:bsc_1238724 into leap-16.0 2025-11-26 10:53:33 +01:00
2 changed files with 13 additions and 2 deletions

View File

@@ -1,3 +1,12 @@
-------------------------------------------------------------------
Fri Nov 14 09:25:59 UTC 2025 - Yuchen Lin <mlin+factory@suse.de>
- 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 <packaging@lists.opensuse.org>

View File

@@ -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