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-18 18:26:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/wsl-appx (Old)
 and      /work/SRC/openSUSE:Factory/.wsl-appx.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "wsl-appx"

Tue May 18 18:26:50 2021 rev:11 rq:892569 version:1

Changes:
--------
--- /work/SRC/openSUSE:Factory/wsl-appx/wsl-appx.changes        2021-05-10 
15:40:41.473248544 +0200
+++ /work/SRC/openSUSE:Factory/.wsl-appx.new.2988/wsl-appx.changes      
2021-05-18 18:27:10.902770165 +0200
@@ -20,0 +21,7 @@
+Fri Mar 5 13:13:26 UTC 2021 - Jeff Kowalczyk <[email protected]>
+
+- wsl-appx package is now metadata input kiwi wsl image type
+  * wsl-appx packages metadata for appx utility to consume via kiwi
+  * WSL kiwi images require wsl-appx metadata and output appx image type
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ wsl-appx.spec ++++++
--- /var/tmp/diff_new_pack.UgoPcY/_old  2021-05-18 18:27:11.334768293 +0200
+++ /var/tmp/diff_new_pack.UgoPcY/_new  2021-05-18 18:27:11.334768293 +0200
@@ -142,58 +142,23 @@
 # Get the binary
 cp %{_mingw64_bindir}/DistroLauncher.exe "$LAUNCHERNAME"
 
-%build
-. ./.settings
-cd files
-## Get the rootfs tarball
-mkdir docker
-tar -xf /usr/share/suse-docker-images/native/*.tar.xz -C docker
-tarball=$(find docker -size +10M)
-mv ${tarball} install.tar
-# XXX for some reason the file from the docker archive has 0 epoch
-touch -d "@${SOURCE_DATE_EPOCH:-`date +%%s`}" install.tar
-ls -al install.tar
-# XXX for some reason it's gzip'd on SLE12 but not in newer distros.
-# Bug in containment-rpm-docker?
-case "`file install.tar`" in
-       *gzip*) mv install.tar install.tar.gz ;;
-       *) gzip install.tar ;;
-esac
-rm -rf docker
-
-# Create a filemap
-find * -type f | awk 'BEGIN { print "[Files]" } /filemap.txt/ { next; } { 
print "\"" $0 "\" \"" $0 "\"" }' > filemap.txt
-
 # TODO So far .pri files are generated by VS and added to the source
 # it would be way better to have them generated here with an opensource tool
 
-appx -o "$APPXNAME" -f filemap.txt
-sha256sum "$APPXNAME" > "$APPXNAME".sha256
-
-mkdir r
-%if 0%{?suse_version} > 1500
-tar -C r -xzf $PWD/install.tar.gz usr/lib/sysimage/rpm/Packages.db
-%else
-%if 0%{?suse_version} > 1315
-tar -C r -xzf $PWD/install.tar.gz usr/lib/sysimage/rpm/Packages
-%else
-tar -C r -xzf $PWD/install.tar.gz var/lib/rpm/Packages
-%endif
-%endif
-rpm --root $PWD/r -qa --qf '%%{size} %%{name}\n' | sort -n > 
"$APPXNAME.packages.sizes"
-rpm --root $PWD/r -qa --qf 
'%%{name}|%%{epoch}|%%{version}|%%{release}|%%{arch}|%%{disturl}|%%{license}\n' 
| sort > "$APPXNAME.packages"
-rm -rf r
-
-echo -n "### APPX size: "
-du -h "$APPXNAME"
+%build
 
 %install
-cd files
-install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/appx
-cp *.appx* $(dirname $RPM_SOURCE_DIR)/OTHER/
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/{Assets,images}
+
+# Be explicit about what is copied to metadata and where
+# Errors about missing contents are useful for debugging
+install -D -m 0644 files/Assets/*.png 
$RPM_BUILD_ROOT%{_datadir}/%{name}/Assets/
+install -D -m 0644 files/images/*.ico 
$RPM_BUILD_ROOT%{_datadir}/%{name}/images/
+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}
 
 %files
-# store package list just for reference
-%doc files/*.appx.*
+%{_datadir}/%{name}
 
 %changelog

Reply via email to