diff --git a/installation-images-17.122.tar.xz b/installation-images-17.122.tar.xz deleted file mode 100644 index 54e4021..0000000 --- a/installation-images-17.122.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7d182cd74412d3a289067b327fa99c0d1d8370db4b9a63fc2779e49fe1381302 -size 246868 diff --git a/installation-images-17.123.tar.xz b/installation-images-17.123.tar.xz new file mode 100644 index 0000000..7f02a93 --- /dev/null +++ b/installation-images-17.123.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:eda288374b7572f13e824c536ec9d009cb90555eefba3e5eaa030c2df19a6181 +size 246928 diff --git a/installation-images.changes b/installation-images.changes index 5a84cc4..c13c8c3 100644 --- a/installation-images.changes +++ b/installation-images.changes @@ -1,3 +1,10 @@ +-------------------------------------------------------------------- +Mon May 6 08:32:09 UTC 2024 - wfeldt@opensuse.org + +- merge gh#openSUSE/installation-images#710 +- require libsolv-tools explicitly +- 17.123 + -------------------------------------------------------------------- Thu May 2 18:00:36 UTC 2024 - wfeldt@opensuse.org diff --git a/installation-images.spec b/installation-images.spec index 304da1d..ac406ee 100644 --- a/installation-images.spec +++ b/installation-images.spec @@ -192,7 +192,7 @@ BuildRequires: SLE-Micro-release %endif %define config_bootmenu_no_upgrade 1 # system-group-kvm needed for 15-SP2 based MicroOS -BuildRequires: system-group-kvm +BuildRequires: system-group-kvm %endif %if "%theme" == "MicroOS" @@ -386,6 +386,7 @@ BuildRequires: dracut-fips BuildRequires: openssh-fips %endif BuildRequires: libpcsclite1 +BuildRequires: libsolv-tools BuildRequires: libyui-ncurses BuildRequires: libyui-ncurses-pkg BuildRequires: libyui-ncurses-rest-api @@ -668,7 +669,7 @@ AutoReqProv: off Summary: Installation Image Files for %theme License: GPL-2.0-or-later Group: Metapackages -Version: 17.122 +Version: 17.123 Release: 0 Provides: installation-images = %version-%release Conflicts: otherproviders(installation-images) @@ -812,8 +813,8 @@ ln -s loader/initrd %{buildroot}/branding/%theme/CD1/boot/x86_64/initrd-xen ln -s loader/linux %{buildroot}/CD1/boot/x86_64/vmlinuz-xen %endif %endif -# get rid of /usr/lib/rpm/brp-strip-debug -# strip kills the zImage.chrp-rs6k +# get rid of /usr/lib/rpm/brp-strip-debug +# strip kills the zImage.chrp-rs6k export NO_BRP_STRIP_DEBUG=true export NO_DEBUGINFO_STRIP_DEBUG=true # for compatibility @@ -856,7 +857,7 @@ install -D -m 644 images/cd1.iso %{_topdir}/ISO/cd1.iso %post -n install-initrd-%{theme} /bin/ln -snf %theme /usr/lib/install-initrd/branding 2>/dev/null || true -%clean +%clean rm -rf %{buildroot} %files