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 2023-08-30 10:21:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wsl-appx (Old)
and /work/SRC/openSUSE:Factory/.wsl-appx.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "wsl-appx"
Wed Aug 30 10:21:03 2023 rev:14 rq:1107961 version:1
Changes:
--------
--- /work/SRC/openSUSE:Factory/wsl-appx/wsl-appx.changes 2021-06-04
00:33:29.352887614 +0200
+++ /work/SRC/openSUSE:Factory/.wsl-appx.new.1766/wsl-appx.changes
2023-08-30 10:23:51.235366572 +0200
@@ -1,0 +2,16 @@
+Tue Aug 22 13:39:42 UTC 2023 - Scott Bradnick <scott.bradn...@suse.com>
+
+- Adding code to remove " Server" from PRETTY_NAME
+ * Should only affect SUSE side.
+
+-------------------------------------------------------------------
+Thu Aug 17 16:33:31 UTC 2023 - Scott Bradnick <scott.bradn...@suse.com>
+
+- To account for /etc/YaST2/products.yaml as part of kiwi-images-wsl,
+ use wsl-appx to save off an updated copy of the .settings file it
+ was already creating.
+ * This file will be sourced by kiwi-images-wsl as it is building
+ Distro .appx files in SLE for the MAJOR_VER and SP_VER vars
+ used for selecting Server|Desktop versions during firstboot.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ wsl-appx.spec ++++++
--- /var/tmp/diff_new_pack.4t4bLN/_old 2023-08-30 10:23:52.311404981 +0200
+++ /var/tmp/diff_new_pack.4t4bLN/_new 2023-08-30 10:23:52.319405266 +0200
@@ -1,7 +1,7 @@
#
# spec file for package wsl-appx
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -82,10 +82,21 @@
# Trim PRETTY_NAME from space, open paren to end of string:
# SUSE Linux Enterprise Server 15 SP3 (Snapshot 16) -> SUSE Linux Enterprise
Server 15 SP3
PRETTY_NAME="${PRETTY_NAME// (*/}"
+# Additionally, remove " Server" as we offer a Server|Desktop version at
firstboot
+PRETTY_NAME="${PRETTY_NAME// Server/}"
APPID="${PRETTY_NAME//[^[:alnum:]]/}"
IDENTITYAPPID="${PRETTY_NAME//[^[:alnum:]\.]/}"
LAUNCHERNAME="${PRETTY_NAME//[^[:alnum:].]/-}.exe"
+# These should work unless we move away from:
+# SUSE Linux Enterprise XX SPY
+# where:
+# XX = MAJOR_VER
+# Y = SP_VER
+#
+MAJOR_VER="${PRETTY_NAME:22:2}"
+SP_VER="${PRETTY_NAME:27:1}"
+
# FIX bsc#1179874 Error in parsing the WSL appx package
# PRETTY_NAME in SLES development snapshots can exceed 40 characters allowed
in ShortName appx schema field
# Define SHORT_NAME as first 35 characters of PRETTY_NAME and use in
AppManifest.xml template
@@ -128,9 +139,10 @@
VERSION=`printf "%d.%d.%d.0" "${VERSION_ID//\./}" "${RELEASE%.*}"
"${RELEASE#*.}"`
fi
-for i in PRETTY_NAME APPID IDENTITYAPPID ARCH PUBLISHER PUBLISHER_DISPLAY_NAME
VERSION LAUNCHERNAME SHORT_NAME; do
+for i in PRETTY_NAME APPID IDENTITYAPPID ARCH PUBLISHER PUBLISHER_DISPLAY_NAME
VERSION LAUNCHERNAME MAJOR_VER SP_VER SHORT_NAME; do
eval echo "\"$i='\$$i'\""
done > .settings
+cp -v .settings files/DOTsettings
cd files
sed -e
"s/@PRETTY_NAME@/${PRETTY_NAME}/g;s/@APPID@/$APPID/g;s/@IDENTITYAPPID@/$IDENTITYAPPID/g;s/@PUBLISHER@/$PUBLISHER/g;s/@PUBLISHER_DISPLAY_NAME@/$PUBLISHER_DISPLAY_NAME/g;s/@VERSION@/${VERSION}/g;s/@LAUNCHERNAME@/$LAUNCHERNAME/g;s/@SHORT_NAME@/$SHORT_NAME/g;s/@ARCH@/$ARCH/g"
\
@@ -155,6 +167,7 @@
install -D -m 0644 files/*.pri $RPM_BUILD_ROOT%{_datadir}/%{name}
install -D -m 0644 files/*.xml $RPM_BUILD_ROOT%{_datadir}/%{name}
install -D -m 0755 files/*.exe $RPM_BUILD_ROOT%{_datadir}/%{name}
+install -D -m 0644 files/DOTsettings $RPM_BUILD_ROOT%{_datadir}/%{name}
%files
%{_datadir}/%{name}
