Accepting request 1190315 from Virtualization

Fix for bsc#1228373 - supermin regression causes virt-inspector to fail

OBS-URL: https://build.opensuse.org/request/show/1190315
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/supermin?expand=0&rev=25

add-rpm-database-location.patch

@@ -0,0 +1,12 @@
+References: bsc#1228373
+
+--- a/src/ph_rpm.ml
++++ b/src/ph_rpm.ml
+@@ -239,6 +239,7 @@ let rpm_package_name pkg =
+   rpm.name
+ 
+ let rpmdb_locations = [
++  "/usr/lib/sysimage/rpm/Packages.db";
+   "/usr/lib/sysimage/rpm/rpmdb.sqlite";
+   "/var/lib/rpm/rpmdb.sqlite";
+   "/var/lib/rpm/Packages"

disable-test-if-newer-ext2.patch

@@ -1,12 +0,0 @@
---- supermin-5.3.4/tests/Makefile.am.orig	2024-07-12 09:00:00.700673571 -0600
-+++ supermin-5.3.4/tests/Makefile.am	2024-07-12 09:00:14.828673908 -0600
-@@ -28,8 +28,7 @@ TESTS = \
- 	test-execstack.sh \
- 	test-build-bash.sh \
- 	test-binaries-exist.sh \
--	test-harder.sh \
--	test-if-newer-ext2.sh
-+	test-harder.sh
- 
- if NETWORK_TESTS
- TESTS += \

supermin.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jul 29 10:16:35 MDT 2024 - carnold@suse.com
+
+- bsc#1228373 - supermin regression in Tumbleweed / Factory causes
+  virt-inspector to fail
+  add-rpm-database-location.patch
+- Drop disable-test-if-newer-ext2.patch
+
 -------------------------------------------------------------------
 Wed Jul 10 15:34:55 MDT 2024 - carnold@suse.com
 

supermin.spec

@@ -28,8 +28,8 @@ Source1:        https://download.libguestfs.org/supermin/5.3-development/supermi
 Source9:        supermin.keyring
 Patch30:        suse_release.patch
 Patch31:        supermin-kernel_version_compressed.patch
-Patch32:        disable-test-if-newer-ext2.patch
-Patch33:        detect-aarch64-kernel.patch
+Patch32:        detect-aarch64-kernel.patch
+Patch33:        add-rpm-database-location.patch
 BuildRequires:  augeas
 BuildRequires:  autoconf
 BuildRequires:  automake