diff --git a/os-autoinst-4.6.1725896784.e007c26.obscpio b/os-autoinst-4.6.1725896784.e007c26.obscpio deleted file mode 100644 index 63d4be4..0000000 --- a/os-autoinst-4.6.1725896784.e007c26.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b2f92691d1f4214ab3378938e3ad9de9ff6fbaf69eaeacdc80b8793a11f800d1 -size 36976653 diff --git a/os-autoinst-4.6.1726244934.3203a88.obscpio b/os-autoinst-4.6.1726244934.3203a88.obscpio new file mode 100644 index 0000000..46c0041 --- /dev/null +++ b/os-autoinst-4.6.1726244934.3203a88.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fe50ff879cb1481791c25a33c785d0cdbb1ef7b25340bcff676d870e13eaa180 +size 36977165 diff --git a/os-autoinst-devel-test.spec b/os-autoinst-devel-test.spec index 898903e..5efbd66 100644 --- a/os-autoinst-devel-test.spec +++ b/os-autoinst-devel-test.spec @@ -18,7 +18,7 @@ %define short_name os-autoinst-devel Name: %{short_name}-test -Version: 4.6.1725896784.e007c26 +Version: 4.6.1726244934.3203a88 Release: 0 Summary: Test package for %{short_name} License: GPL-2.0-or-later diff --git a/os-autoinst-openvswitch-test.spec b/os-autoinst-openvswitch-test.spec index 86f0456..741da10 100644 --- a/os-autoinst-openvswitch-test.spec +++ b/os-autoinst-openvswitch-test.spec @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst-openvswitch Name: %{short_name}%{?name_ext} -Version: 4.6.1725896784.e007c26 +Version: 4.6.1726244934.3203a88 Release: 0 Summary: test package for %{short_name} License: GPL-2.0-or-later diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index d4267c9..f69acdc 100644 --- a/os-autoinst-test.spec +++ b/os-autoinst-test.spec @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1725896784.e007c26 +Version: 4.6.1726244934.3203a88 Release: 0 Summary: test package for os-autoinst License: GPL-2.0-or-later diff --git a/os-autoinst.changes b/os-autoinst.changes index ac2b759..cb10457 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Sep 13 17:21:31 UTC 2024 - okurz@suse.com + +- Update to version 4.6.1726244934.3203a88: + * video_stream: fix setting EDID when using ffmpeg and explicit FPS + * Exclude sub packages with many additional dependencies on SLE + * Replace single quotes with double of URLs in the log strings + * Fix pod for backend_get_wait_still_screen_on_here_doc_input + * Virsh VMware images shell snippet debugging added + ------------------------------------------------------------------- Mon Sep 09 15:46:32 UTC 2024 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index 639fd50..7937b3f 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,4 +1,4 @@ name: os-autoinst -version: 4.6.1725896784.e007c26 -mtime: 1725896784 -commit: e007c26db0f8e0a1cc3d9d8bf87f249308fe9186 +version: 4.6.1726244934.3203a88 +mtime: 1726244934 +commit: 3203a88cb7480259b91398cee8a916f94655f50a diff --git a/os-autoinst.spec b/os-autoinst.spec index 6f15a0e..54bc228 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1725896784.e007c26 +Version: 4.6.1726244934.3203a88 Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -31,6 +31,14 @@ Source0: %{name}-%{version}.tar.xz %else %define opencv_require pkgconfig(opencv) %endif +# exclude additional sub packages that would pull in a lot of extra dependencies on SLE +%if 0%{?sle_version} && !0%{?is_opensuse} +%bcond_with devel_package +%bcond_with deps_package +%else +%bcond_without devel_package +%bcond_without deps_package +%endif # The following line is generated from dependencies.yaml %define build_base_requires %opencv_require gcc-c++ perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) # The following line is generated from dependencies.yaml @@ -150,6 +158,7 @@ automated testing frameworks. However, it can just as well be used to test firefox and openoffice operation on top of a newly installed OS. +%if %{with devel_package} %package devel Summary: Development package pulling in all build+test dependencies Group: Development/Tools/Other @@ -157,6 +166,7 @@ Requires: %devel_requires %description devel Development package pulling in all build+test dependencies. +%endif %package openvswitch Summary: Openvswitch support for os-autoinst @@ -199,6 +209,7 @@ Requires: swtpm %description swtpm Convenience package providing os-autoinst and swtpm dependencies. +%if %{with deps_package} %package s390-deps Summary: Convenience package providing os-autoinst + s390 worker jumphost deps Group: Development/Tools/Other @@ -216,6 +227,7 @@ Requires: os-autoinst %description ipmi-deps Convenience package providing os-autoinst + ipmi worker jumphost dependencies. +%endif %prep %setup -q @@ -337,7 +349,9 @@ fi %config /etc/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf %{_sbindir}/rcos-autoinst-openvswitch +%if %{with devel_package} %files devel +%endif %ifarch x86_64 %files qemu-kvm @@ -345,9 +359,10 @@ fi %endif %files swtpm - +%if %{with deps_package} %files s390-deps %files ipmi-deps +%endif %changelog