Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package wsl-appx for openSUSE:Factory
checked in at 2021-05-20 19:24:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wsl-appx (Old)
and /work/SRC/openSUSE:Factory/.wsl-appx.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wsl-appx"
Thu May 20 19:24:45 2021 rev:12 rq:894520 version:1
Changes:
--------
--- /work/SRC/openSUSE:Factory/wsl-appx/wsl-appx.changes 2021-05-18
18:27:10.902770165 +0200
+++ /work/SRC/openSUSE:Factory/.wsl-appx.new.2988/wsl-appx.changes
2021-05-20 19:25:07.321927314 +0200
@@ -1,0 +2,32 @@
+Thu May 13 07:24:07 UTC 2021 - Jeff Kowalczyk <jkowalc...@suse.com>
+
+- Remove circular dependency on kiwi WSL image to set release
+ number as digits of VERSION passed to AppxManifest.xml template.
+ * Previously an aggregate package ensured kiwi
+ opensuse-wsl-image or suse-wsl-image were available at
+ wsl-appx build time.
+ * Now that kiwi directly produces appx images and wsl-appx is
+ used only for creating appx metadata, this circular dependency
+ should be removed.
+ * One option would be to use another package for release number,
+ e.g. openSUSE-release.
+ * At this time, set digits two and three of appx VERSION to 0
+ for subsequent regex or template substitution during kiwi
+ image build.
+ * A future revision may set digit two and three of appx VERSION
+ to this wsl-appx $RELEASE digits so they will increment for
+ sideload upgrades, although still are not suitable for
+ Microsoft Store upload without kiwi substitution.
+ * Kiwi image build must now substitute a release number in
+ AppxManifest.xml via OBS source service or other templating
+ mechanism available to kiwi.
+ * For reference, digits of appx VERSION are limited to the
+ following ranges: # 0-65535, 0-65535, 0-65535, 0
+
+-------------------------------------------------------------------
+Thu May 13 04:35:23 UTC 2021 - Jeff Kowalczyk <jkowalc...@suse.com>
+
+- Fix Tumbleweed appx VERSION assignment. Bash printf %02d parses
+ string dates 08 and 09 as octal so force base 10 with 10#expr.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wsl-appx.spec ++++++
--- /var/tmp/diff_new_pack.XaBY4B/_old 2021-05-20 19:25:07.709925723 +0200
+++ /var/tmp/diff_new_pack.XaBY4B/_new 2021-05-20 19:25:07.713925707 +0200
@@ -19,12 +19,6 @@
# needsappxsslcertforbuild
-%if 0%{?is_opensuse}
-%define image_package opensuse-wsl-image
-%else
-%define image_package suse-wsl-image
-%endif
-
Name: wsl-appx
Version: 1
Release: 0
@@ -44,7 +38,6 @@
%else
BuildRequires: sles-release
%endif
-BuildRequires: %image_package
BuildRequires: openssl(cli)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -100,8 +93,12 @@
# 'SUSE Linux Enterprise Server 15 SP3 (Snapshot11)' -> 'SUSE Linux Enterprise
Server 15 SP3'
SHORT_NAME="${PRETTY_NAME::35}"
-# Use the release number of the image package to set appx version submitted to
the MS Store
-RELEASE="`rpm -q --qf '%%{release}' %image_package`"
+# RELEASE is used for digits of the appx version submitted to the MS Store.
+# To remove the circular dependency on kiwi opensuse-wsl-image or
suse-wsl-image,
+# set RELEASE here to be an easily matched string of integer digits.
+# Substitute these digits with an actual release number during kiwi
+# image build using OBS source services.
+RELEASE="0.0"
ARCH="%_arch"
case "$ARCH" in
x86_64) ARCH="x64" ;;
@@ -120,12 +117,15 @@
# 0-65535, 0-65535, 0-65535, 0
# Where the fourth segment is reserved for the MS Store use.
if [ "$ID" = "opensuse-tumbleweed" ]; then
- VERSION=`printf "%d.%d.%d%02d.0" "${VERSION_ID:2:4}" "${VERSION_ID:6}"
"${RELEASE%.*}" "${RELEASE#*.}"`
+ # Specify base 10 (10#) for VERSION_ID substring
+ # to avoid octal parsing for dates ending in 08 and 09
+ # printf: 08: invalid octal number
+ VERSION=`printf "%d.%d.%d%02d.0" "${VERSION_ID:2:4}"
"$((10#${VERSION_ID:6}))" "${RELEASE%.*}" "${RELEASE#*.}"`
APPXNAME="${PRETTY_NAME//[^[:alnum:].]/-}-$ARCH-Build$VERSION_ID.$RELEASE.appx"
else
RELEASE="${RELEASE/lp???./}"
# Concatenate digits of VERSION_ID to consume only one segment 0-65535
e.g. 15.3 -> 153
- # Retain image package version number in the two remaining segments
0-65535.0-65535
+ # Retain RELEASE version number in the two remaining segments
0-65535.0-65535
VERSION=`printf "%d.%d.%d.0" "${VERSION_ID//\./}" "${RELEASE%.*}"
"${RELEASE#*.}"`
APPXNAME="${PRETTY_NAME//[^[:alnum:].]/-}-$ARCH-Build$RELEASE.appx"
fi
