Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package obs-service-kiwi_metainfo_helper for openSUSE:Factory checked in at 2022-01-26 21:26:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper (Old) and /work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.1938 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "obs-service-kiwi_metainfo_helper" Wed Jan 26 21:26:41 2022 rev:11 rq:948973 version:0.5 Changes: -------- --- /work/SRC/openSUSE:Factory/obs-service-kiwi_metainfo_helper/obs-service-kiwi_metainfo_helper.changes 2022-01-20 00:12:33.690590157 +0100 +++ /work/SRC/openSUSE:Factory/.obs-service-kiwi_metainfo_helper.new.1938/obs-service-kiwi_metainfo_helper.changes 2022-01-26 21:27:00.045985666 +0100 @@ -1,0 +2,6 @@ +Mon Jan 24 09:36:17 UTC 2022 - Frederic Crozat <fcro...@suse.com> + +- Generate OS_VERSION based on os-release VERSION (bsc#1195061). +- Bump version to 0.5 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ obs-service-kiwi_metainfo_helper.spec ++++++ --- /var/tmp/diff_new_pack.1lj8MB/_old 2022-01-26 21:27:00.853980095 +0100 +++ /var/tmp/diff_new_pack.1lj8MB/_new 2022-01-26 21:27:00.861980040 +0100 @@ -17,7 +17,7 @@ Name: obs-service-kiwi_metainfo_helper -Version: 0.4 +Version: 0.5 Release: 0 Summary: Service for substituting various variables in build recipes License: GPL-2.0-or-later ++++++ README ++++++ --- /var/tmp/diff_new_pack.1lj8MB/_old 2022-01-26 21:27:00.917979654 +0100 +++ /var/tmp/diff_new_pack.1lj8MB/_new 2022-01-26 21:27:00.921979626 +0100 @@ -12,6 +12,7 @@ | %SOURCEURL% | Source url for container recipe (IBS) | https://sources.suse.com/SUSE:SLE-15:Update:CR/sles15-image/2951b67133dd6384cacb28203174e030/ | | %RELEASE% | The OBS release number (<cicnt\>.<bldcnt\>) | 4.2 | | %BUILDTIME% | $(date --utc +%FT%T.%NZ) | 2018-10-30T09:19:02.074934628Z | +| %OS_VERSION% | VERSION in the os-release file | 15 | | %OS_VERSION_ID% | VERSION_ID in the os-release file | 15 | | %OS_VERSION_ID_SP% | Like VERSION_ID, but with SP (SLE only) | 15.0 | | %OS_PRETTY_NAME% | PRETTY_NAME in the os-release file | SUSE Linux Enterprise Server 15 SP3 (Snapshot16) | ++++++ kiwi_metainfo_helper ++++++ --- /var/tmp/diff_new_pack.1lj8MB/_old 2022-01-26 21:27:00.941979488 +0100 +++ /var/tmp/diff_new_pack.1lj8MB/_new 2022-01-26 21:27:00.945979461 +0100 @@ -77,6 +77,7 @@ [ -f "${tempdir}/usr/lib/os-release" ] && . "${tempdir}/usr/lib/os-release" [ -f "${tempdir}/etc/os-release" ] && . "${tempdir}/etc/os-release" + VERSION="${VERSION:-}" # Special case for SLE X "SP 0", make sure it has .0 VERSION_ID_SP="${VERSION_ID}" [[ "${VERSION_ID_SP%}" == *"."* ]] || VERSION_ID_SP="${VERSION_ID}.0" @@ -118,6 +119,7 @@ -e "s/%OS_PRETTY_NAME_DASHED%/${PRETTY_NAME_DASHED}/g" \ -e "s/%OS_PRETTY_NAME_BEFORE_PAREN%/${PRETTY_NAME_BEFORE_PAREN}/g" \ -e "s/%OS_PRETTY_NAME_BEFORE_PAREN_DASHED%/${PRETTY_NAME_BEFORE_PAREN_DASHED}/g" \ + -e "s/%OS_VERSION%/${VERSION}/g" \ -e "s/%OS_VERSION_ID_SP%/${VERSION_ID_SP}/g" "${files[@]}" fi ++++++ test.sh ++++++ --- /var/tmp/diff_new_pack.1lj8MB/_old 2022-01-26 21:27:00.997979102 +0100 +++ /var/tmp/diff_new_pack.1lj8MB/_new 2022-01-26 21:27:01.001979074 +0100 @@ -33,6 +33,7 @@ SOURCEURL=%SOURCEURL% RELEASE=%RELEASE% BUILDTIME=%BUILDTIME% +OS_VERSION=%OS_VERSION% OS_VERSION_ID=%OS_VERSION_ID% OS_VERSION_ID_SP=%OS_VERSION_ID_SP% OS_PRETTY_NAME=%OS_PRETTY_NAME% @@ -49,6 +50,7 @@ SOURCEURL=https://build.opensuse.org/package/show/openSUSE:Factory/opensuse-tumbleweed-image?rev=0f40c57dd619e1dff9e512949b6bca09 RELEASE=4.2 BUILDTIME=2018-10-30T09:19:02.074934628Z +OS_VERSION=15-SP4 OS_VERSION_ID=15.4 OS_VERSION_ID_SP=15.4 OS_PRETTY_NAME=SUSE Linux Enterprise Server 15 SP4