000reelease-packages: fix the changed version number in os-release and Leap.prod #51

Manually merged
openSUSE merged 1 commits from maxlin_factory/Leap:fix_os_release_160 into leap-16.0 2025-12-03 10:58:17 +01:00
2 changed files with 14 additions and 7 deletions

View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Dec 2 11:01:04 UTC 2025 - Yuchen Lin <mlin+factory@suse.de>
- Fix the previous change which changed the version number in
os-release and Leap.prod bsc#1238724
-------------------------------------------------------------------
Fri Nov 14 09:25:59 UTC 2025 - Yuchen Lin <mlin+factory@suse.de>

View File

@@ -23,6 +23,7 @@
%define codename Leap
%define obsoleted_codename openSUSE
%define theme_ver +leap
%define pure_ver 16.0
Name: Leap-release
Version: 16.0%{theme_ver}
@@ -45,8 +46,8 @@ Provides: system-installation() = openSUSE
Obsoletes: aaa_version
Obsoletes: openSUSE-Promo-release <= 11.1
Obsoletes: openSUSE-release-live <= 11.0
Provides: product_flavor(openSUSE) = %{version}
Provides: product_flavor(%{product}) = %{version}
Provides: product_flavor(openSUSE) = %{pure_ver}
Provides: product_flavor(%{product}) = %{pure_ver}
Conflicts: sles-release <= 10 sled-release <= 10 core-release <= 10
Conflicts: otherproviders(distribution-release)
Obsoletes: openSUSE-release < %{version}
@@ -338,7 +339,7 @@ cat >%{buildroot}%{_sysconfdir}/products.d/Leap.prod << EOF
</buildconfig>
<installconfig>
<defaultlang>en_US</defaultlang>
<releasepackage name="Leap-release" flag="EQ" version="%{version}" release="%{release}"/>
<releasepackage name="Leap-release" flag="EQ" version="%{pure_ver}" release="%{release}"/>
<distribution>openSUSE</distribution>
</installconfig>
<runtimeconfig/>
@@ -352,18 +353,18 @@ This package only exists for providing the product flavor 'ftp'.
EOF
VERSION_ID=`echo %{version}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
VERSION_ID=`echo %{pure_ver}|tr '[:upper:]' '[:lower:]'|sed -e 's/ //g;'`
# note: VERSION is an optional field and has no meaning other than informative on a rolling distro
# We do thus not add it to the os-release file
cat > %{buildroot}%{_prefix}/lib/os-release <<EOF
NAME="openSUSE Leap"
VERSION="%{version}%{?betaversion:%{betaversion}}"
VERSION="%{pure_ver}%{?betaversion:%{betaversion}}"
ID="opensuse-leap"
ID_LIKE="suse opensuse"
VERSION_ID="$VERSION_ID"
PRETTY_NAME="openSUSE Leap %{version}%{?betaversion:%{betaversion}}"
PRETTY_NAME="openSUSE Leap %{pure_ver}%{?betaversion:%{betaversion}}"
ANSI_COLOR="0;32"
CPE_NAME="cpe:/o:opensuse:leap:%{version}"
CPE_NAME="cpe:/o:opensuse:leap:%{pure_ver}"
BUG_REPORT_URL="https://bugs.opensuse.org"
HOME_URL="https://www.opensuse.org/"
DOCUMENTATION_URL="https://en.opensuse.org/Portal:Leap"