diff --git a/.gitignore b/.gitignore
index de64619..e99b82c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,3 +44,4 @@
 /os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz
 /os-autoinst-5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4.tar.gz
 /os-autoinst-b781299edace8743b63e826d85c4f7a24ac70817.tar.gz
+/os-autoinst-f54bdeab5173b70032d1d3fcfe2e86395f6e47c8.tar.gz
diff --git a/0001-t-Fix-regex-for-warning-multiline.patch b/0001-t-Fix-regex-for-warning-multiline.patch
deleted file mode 100644
index 1fe4d3b..0000000
--- a/0001-t-Fix-regex-for-warning-multiline.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c2a1e23ce3347359a868d287379710e603cff523 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tina=20M=C3=BCller?= <tina.mueller@suse.com>
-Date: Tue, 18 Aug 2020 12:19:45 +0200
-Subject: [PATCH] t: Fix regex for warning (multiline)
-
-Apparently on some platforms/versions of qemu the error message is
-multiline, so the regex needs an /s modifier.
-
-    'init_blockdev_images: 'create -f qcow2 raid/hd0 420G' failed after 2 tries: runcmd 'qemu-img create -f qcow2 raid/hd0 420G' failed with exit code 1: 'Formatting 'raid/hd0', fmt=qcow2 cluster_size=65536 compression_type=zlib size=450971566080 lazy_refcounts=off refcount_bits=16
-    qemu-img: raid/hd0: Could not create file: No such file or directory' at /home/abuild/rpmbuild/BUILD/os-autoinst-4.6.1597406683.45b10929/osutils.pm line 121.
-
-Issue: https://progress.opensuse.org/issues/70120
----
- t/18-qemu.t | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/t/18-qemu.t b/t/18-qemu.t
-index dbaab45b..bee6dda4 100755
---- a/t/18-qemu.t
-+++ b/t/18-qemu.t
-@@ -153,7 +153,7 @@ $proc->deserialise_state(path($path)->slurp());
- is_deeply(\@gcmdl, \@cmdl, 'Multipath Command line after serialisation and deserialisation');
- 
- $ENV{QEMU_IMG_CREATE_TRIES} = 2;
--my $expected = qr/failed after 2 tries.*No such.*directory/;
-+my $expected = qr/failed after 2 tries.*No such.*directory/s;
- my @warnings = warnings {
-     like exception { $proc->init_blockdev_images() }, $expected, 'init_blockdev_images can report error';
- };
--- 
-2.28.0
-
diff --git a/1508.patch b/1508.patch
deleted file mode 100644
index 442744b..0000000
--- a/1508.patch
+++ /dev/null
@@ -1,374 +0,0 @@
-From 6442f889a3e45e782ad4c2e4c737442e09f895f5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?=
- <lruzicka@redhat.com>
-Date: Mon, 17 Aug 2020 13:35:10 +0200
-Subject: [PATCH 1/3] Add `mouse_drag` subroutine to support click and drag in
- tests
-
-1. This PR adds the `mouse_drag` subroutine that enables the mouse and drag
-support for OpenQA tests. To use the subroutine, it is possible to either
-provide a "starting" and "ending" needle from which the starting and finishing
-points will be calculated (using the centres of the needle tag), or
-coordinates might be provided directly. If both needles and coordinates are
-provided at the same time, then the coordinates precede over the needles.
-Combinations are possible, too, which means that one of the points can
-be passed as a needle and the other as coordinates.
-
-2. In order not to repete code, the part responsible for calculating the
-center of needle was removed from the `click_lastmatch` subroutine and moved
-into a standalone non-exported subroutine called `calculate_clickpoint` to be
-also used by the `mouse_drag` subroutine, as well as by the original
-`click_lastmatch`.
-
-3. This PR solves action #39335
----
- testapi.pm | 109 +++++++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 93 insertions(+), 16 deletions(-)
-
-diff --git a/testapi.pm b/testapi.pm
-index ed94bd5875..22a062e873 100755
---- a/testapi.pm
-+++ b/testapi.pm
-@@ -48,7 +48,7 @@ our @EXPORT = qw($realname $username $password $serialdev %cmd %vars
- 
-   assert_screen check_screen assert_and_dclick save_screenshot
-   assert_and_click mouse_hide mouse_set mouse_click
--  mouse_dclick mouse_tclick match_has_tag click_lastmatch
-+  mouse_dclick mouse_tclick match_has_tag click_lastmatch mouse_drag
- 
-   assert_script_run script_run assert_script_sudo script_sudo
-   script_output validate_script_output
-@@ -108,6 +108,36 @@ os-autoinst is used in the openQA project.
- 
- =head1 internal
- 
-+=head2 _calculate_clickpoint
-+
-+This subroutine is used to by several subroutines dealing with mouse clicks to calculate
-+a clickpoint, when only the needle area is available. It takes the area coordinates and
-+returns the center of that area. It is meant to be a helper subroutine not available 
-+to be used in tests.
-+
-+=cut    
-+
-+sub _calculate_clickpoint {
-+    my ($needle_to_use, $needle_area, $click_point) = @_;
-+    # If there is no needle area defined, take it from the needle itself.
-+    if (!$needle_area) {
-+        $needle_area = $needle_to_use->{area}->[-1];
-+    }
-+    # If there is no clickpoint defined, or if it has been specifically defined as "center"
-+    # then calculate the click point as a central point of the specified area.
-+    if (!$click_point || $click_point eq 'center') {
-+        $click_point = {
-+            xpos => $needle_area->{w} / 2,
-+            ypos => $needle_area->{h} / 2,
-+        };
-+    }
-+    # Use the click point coordinates (which are relative numbers inside of the area)
-+    # to calculate the absolute click point position.
-+    my $x = int($needle_area->{x} + $click_point->{xpos});
-+    my $y = int($needle_area->{y} + $click_point->{ypos});
-+    return $x, $y;
-+}
-+
- =for stopwords xen hvc0 xvc0 ipmi ttyS
- 
- =head2 init
-@@ -522,25 +552,12 @@ sub click_lastmatch {
-     my $relative_click_point;
-     for my $area (reverse @{$last_matched_needle->{area}}) {
-         next unless ($relative_click_point = $area->{click_point});
--
-         $relevant_area = $area;
-         last;
-     }
- 
--    # use center of the last area if no area contains click coordinates
--    if (!$relevant_area) {
--        $relevant_area = $last_matched_needle->{area}->[-1];
--    }
--    if (!$relative_click_point || $relative_click_point eq 'center') {
--        $relative_click_point = {
--            xpos => $relevant_area->{w} / 2,
--            ypos => $relevant_area->{h} / 2,
--        };
--    }
--
--    # calculate absolute click position and click
--    my $x = int($relevant_area->{x} + $relative_click_point->{xpos});
--    my $y = int($relevant_area->{y} + $relative_click_point->{ypos});
-+    # Calculate the absolute click point.
-+    my ($x, $y) = _calculate_clickpoint($last_matched_needle, $relevant_area, $relative_click_point);
-     bmwqemu::diag("clicking at $x/$y");
-     mouse_set($x, $y);
-     if ($args{dclick}) {
-@@ -1549,6 +1566,66 @@ sub mouse_hide(;$) {
-     query_isotovideo('backend_mouse_hide', {offset => $border_offset});
- }
- 
-+=head2 mouse_drag
-+  mouse_drag([$startpoint, $endpoint, $startx, $starty, $endx, $endy, $button, $timeout]);
-+
-+Click mouse C<$button>, C<'left'> or C<'right'>, at a given location, hold the button and drag 
-+the mouse to another location where the button is released. You can set the C<$startpoint> 
-+and C<$endpoint> by passing the name of the needle tag, i.e. the mouse drag happens between
-+the two needle areas. Alternatively, you can set all the coordinates explicitly with C<$startx>,
-+C<$starty>, C<$endx>, and C<$endy>. You can also set one point using a needle and another one
-+using coordinates.  If both the coordinates and the needle are provided, the coordinates 
-+will be used to set up the locations and the needle location will be overridden.
-+
-+=cut
-+
-+sub mouse_drag {
-+    my %args = @_;
-+    my ($startx, $starty, $endx, $endy);
-+    # If full coordinates are provided, work with them as a priority,
-+    if (defined $args{startx} and defined $args{starty}) {
-+        $startx = $args{startx};
-+        $starty = $args{starty};
-+    }
-+    # If the coordinates were not complete, use the needle as a fallback solution.
-+    elsif (defined $args{startpoint}) {
-+        my $startmatch = $args{startpoint};
-+        # Check that the needle exists.
-+        my $start_matched_needle = assert_screen($startmatch, $args{timeout});
-+        # Calculate the click point from the area defined by the needle (take the center of it)
-+        ($startx, $starty) = _calculate_clickpoint($start_matched_needle);
-+    }
-+    # If neither coordinates nor a needle is provided, report an error and quit.
-+    else {
-+        die "The starting point of the drag was not correctly provided. Either provide the 'startx' and 'starty' coordinates, or a needle marking the starting point.";
-+    }
-+
-+    # Repeat the same for endpoint coordinates or needles.
-+    if (defined $args{endx} and defined $args{endy}) {
-+        $endx = $args{endx};
-+        $endy = $args{endy};
-+    }
-+    elsif (defined $args{endpoint}) {
-+        my $endmatch           = $args{endpoint};
-+        my $end_matched_needle = assert_screen($endmatch, $args{timeout});
-+        ($endx, $endy) = _calculate_clickpoint($end_matched_needle);
-+    }
-+    else {
-+        die "The ending point of the drag was not correctly provided. Either provide the 'endx' and 'endy' coordinates, or a needle marking the end point.";
-+    }
-+    # Get the button variable. If no button has been provided, assume the "left" button.
-+    my $button = $args{button} // "left";
-+    bmwqemu::log_call("mouse dragged", button => $button);
-+
-+    # Now, perform the actual mouse drag. Navigate to the startpoint location,
-+    # press and hold the mouse button, then navigate to the endpoint location
-+    # and release the mouse button.
-+    mouse_set($startx, $starty);
-+    query_isotovideo('backend_mouse_button', {button => $button, bstate => 1});
-+    mouse_set($endx, $endy);
-+    query_isotovideo('backend_mouse_button', {button => $button, bstate => 0});
-+}
-+
- =head1 multi console support
- 
- All C<testapi> commands that interact with the system under test do that
-
-From 5e6d7d1f868430de25cbd1ae6f1168d74d29bed6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?=
- <lruzicka@redhat.com>
-Date: Tue, 25 Aug 2020 10:04:01 +0200
-Subject: [PATCH 2/3] Write tests for _calculate_clickpoint
-
----
- t/03-testapi.t | 28 ++++++++++++++++++++++++++++
- 1 file changed, 28 insertions(+)
-
-diff --git a/t/03-testapi.t b/t/03-testapi.t
-index d53aa12590..edca0eb418 100755
---- a/t/03-testapi.t
-+++ b/t/03-testapi.t
-@@ -683,4 +683,32 @@ subtest 'autoinst_url' => sub {
-     is(autoinst_url('foo'), 'http://localhost:1/foo', 'we can configure the hostname that autoinst_url returns');
- };
- 
-+subtest '_calculate_clickpoint' => sub {
-+    my %fake_needle = (
-+        area => [{x => 10, y => 10, w => 20, h => 30}],
-+    );
-+    my %fake_needle_area = (x    => 100, y    => 100, w => 50, h => 40);
-+    my %fake_click_point = (xpos => 20,  ypos => 10);
-+
-+    # Everything is provided.
-+    my ($x, $y) = testapi::_calculate_clickpoint(\%fake_needle, \%fake_needle_area, \%fake_click_point);
-+    is($x, 120);
-+    is($y, 110);
-+
-+    # Everything is provided but the click point is 'center'
-+    ($x, $y) = testapi::_calculate_clickpoint(\%fake_needle, \%fake_needle_area, "center");
-+    is($x, 125);
-+    is($y, 120);
-+
-+    # Just the area is provided and no click point.
-+    ($x, $y) = testapi::_calculate_clickpoint(\%fake_needle, \%fake_needle_area);
-+    is($x, 125);
-+    is($y, 120);
-+
-+    # Just the needle is provided and no area and click point.
-+    ($x, $y) = testapi::_calculate_clickpoint(\%fake_needle);
-+    is($x, 20);
-+    is($y, 25);
-+};
-+
- done_testing;
-
-From 168d4437c7de938c50609331ffb26a6241a343a1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Luk=C3=A1=C5=A1=20R=C5=AF=C5=BEi=C4=8Dka?=
- <lruzicka@redhat.com>
-Date: Wed, 26 Aug 2020 10:32:02 +0200
-Subject: [PATCH 3/3] Write tests for mouse_drag
-
----
- t/03-testapi.t | 113 +++++++++++++++++++++++++++++++++++++++++++++++++
- testapi.pm     |   2 +-
- 2 files changed, 114 insertions(+), 1 deletion(-)
-
-diff --git a/t/03-testapi.t b/t/03-testapi.t
-index edca0eb418..e25b831765 100755
---- a/t/03-testapi.t
-+++ b/t/03-testapi.t
-@@ -711,4 +711,117 @@ subtest '_calculate_clickpoint' => sub {
-     is($y, 25);
- };
- 
-+subtest 'mouse_drag' => sub {
-+    my $mock_testapi = Test::MockModule->new('testapi');
-+    my @area         = ({x => 100, y => 100, w => 20, h => 20});
-+    $mock_testapi->redefine(assert_screen => {area => \@area});
-+
-+    my ($startx, $starty) = (0,   0);
-+    my ($endx,   $endy)   = (200, 200);
-+    my $button = "left";
-+    $cmds = [];
-+    # Startpoint from a needle. Endpoint coordinates.
-+    mouse_drag(startpoint => 'foo', endx => $endx, endy => $endy, button => $button, timeout => 30);
-+    is_deeply($cmds, [
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 110,
-+                y   => 110
-+            },
-+            {
-+                bstate => 1,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 200,
-+                y   => 200
-+            },
-+            {
-+                bstate => 0,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+    ], 'mouse drag (startpoint defined by a needle)') or diag explain $cmds;
-+
-+    # Startpoint from coordinates, endpoint from a needle.
-+    $cmds = [];
-+    mouse_drag(endpoint => 'foo', startx => $startx, starty => $starty, button => $button, timeout => 30);
-+    is_deeply($cmds, [
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 0,
-+                y   => 0
-+            },
-+            {
-+                bstate => 1,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 110,
-+                y   => 110
-+            },
-+            {
-+                bstate => 0,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+    ], 'mouse drag (endpoint defined by a needle)') or diag explain $cmds;
-+
-+    # Using coordinates only.
-+    $cmds = [];
-+    mouse_drag(endx => $endx, endy => $endy, startx => $startx, starty => $starty, button => $button, timeout => 30);
-+    is_deeply($cmds, [
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 0,
-+                y   => 0
-+            },
-+            {
-+                bstate => 1,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 200,
-+                y   => 200
-+            },
-+            {
-+                bstate => 0,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+    ], 'mouse drag (start and endpoints defined by coordinates)') or diag explain $cmds;
-+
-+    # Both needle and coordinates provided for startpoint (coordinates should win).
-+    $cmds = [];
-+    mouse_drag(startpoint => "foo", endx => $endx, endy => $endy, startx => $startx, starty => $starty, button => $button, timeout => 30);
-+    is_deeply($cmds, [
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 0,
-+                y   => 0
-+            },
-+            {
-+                bstate => 1,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+            {
-+                cmd => 'backend_mouse_set',
-+                x   => 200,
-+                y   => 200
-+            },
-+            {
-+                bstate => 0,
-+                button => 'left',
-+                cmd    => 'backend_mouse_button'
-+            },
-+    ], 'mouse drag (redundant definiton by a needle)') or diag explain $cmds;
-+};
-+
- done_testing;
-diff --git a/testapi.pm b/testapi.pm
-index 22a062e873..fe16c29b07 100755
---- a/testapi.pm
-+++ b/testapi.pm
-@@ -1615,7 +1615,6 @@ sub mouse_drag {
-     }
-     # Get the button variable. If no button has been provided, assume the "left" button.
-     my $button = $args{button} // "left";
--    bmwqemu::log_call("mouse dragged", button => $button);
- 
-     # Now, perform the actual mouse drag. Navigate to the startpoint location,
-     # press and hold the mouse button, then navigate to the endpoint location
-@@ -1624,6 +1623,7 @@ sub mouse_drag {
-     query_isotovideo('backend_mouse_button', {button => $button, bstate => 1});
-     mouse_set($endx, $endy);
-     query_isotovideo('backend_mouse_button', {button => $button, bstate => 0});
-+    bmwqemu::log_call(message => "Mouse dragged from $startx,$starty to $endx, $endy", button => $button);
- }
- 
- =head1 multi console support
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 5ff0558..cdb2ae2 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -24,32 +24,25 @@
 # I tried to sell upstream on naming these properly and installing
 # them to the perl vendor dir, but they wouldn't bite.
 # https://github.com/os-autoinst/os-autoinst/issues/387
-%global __provides_exclude_from %{_libexecdir}/os-autoinst
+%global __provides_exclude_from %{_prefix}/lib/os-autoinst
 %global __requires_exclude perl\\((autotest|backend|basetest|bmwqemu|commands|consoles|cv|distribution|lockapi|mmapi|myjsonrpc|needle|ocr|osutils|signalblocker|testapi|OpenQA::Exceptions|OpenQA::Benchmark::Stopwatch|OpenQA::Qemu|OpenQA::Isotovideo)
 %{?perl_default_filter}
 
 %global github_owner    os-autoinst
 %global github_name     os-autoinst
 %global github_version  4.6
-%global github_commit   b781299edace8743b63e826d85c4f7a24ac70817
+%global github_commit   f54bdeab5173b70032d1d3fcfe2e86395f6e47c8
 # if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date     20200804
+%global github_date     20201023
 %global shortcommit     %(c=%{github_commit}; echo ${c:0:7})
 
 Name:           os-autoinst
 Version:        %{github_version}
-Release:        28%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release:        29%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
 Summary:        OS-level test automation
 License:        GPLv2+
 URL:            https://os-autoinst.github.io/openQA/
 Source0:        https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz
-# Fix a test regex to be multiline
-# https://github.com/os-autoinst/os-autoinst/commit/c2a1e23ce3347359a868d287379710e603cff523
-# https://bugzilla.redhat.com/show_bug.cgi?id=1873028
-Patch0:         0001-t-Fix-regex-for-warning-multiline.patch
-# Add click-and-drag support to testapi (from lruzicka)
-# https://github.com/os-autoinst/os-autoinst/pull/1508
-Patch1:         1508.patch
 
 # on SUSE this is conditional, for us it doesn't have to be but we
 # still use a macro just to keep build_requires similar for ease of
@@ -70,17 +63,21 @@ Patch1:         1508.patch
 # main_requires_additional and the perl(:MODULE_COMPAT) require below
 # The following line is generated from dependencies.yaml (upstream)
 %define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp) perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader) perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib) perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec) perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar) perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX) perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils) perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.26 perl(Mojo::JSON) perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42 perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2) perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor) perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict) perl(warnings)
+# diff from SUSE: SUSE has python3-yamllint, Fedora has just yamllint
+# The following line is generated from dependencies.yaml (upstream)
+%define yamllint_requires yamllint
 # all requirements needed by the tests, do not require on this in the package
 # itself or any sub-packages
 # diff from SUSE: replaced qemu with qemu-kvm, qemu-tools with
 # qemu-img, and qemu-x86 with qemu-system-i386
 # The following line is generated from dependencies.yaml (upstream)
-%define test_base_requires %main_requires perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386
+%define test_base_requires %main_requires perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo) perl(Test::Most) perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings) >= 0.029 procps python3-setuptools qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386
+# The following line is generated from dependencies.yaml (upstream)
+%define test_version_only_requires perl(Mojo::IOLoop::ReadWriteProcess) >= 0.28
 # The following line is generated from dependencies.yaml (upstream)
 %define test_legacy_requires %build_legacy_requires %test_base_requires
-# diff from SUSE: SUSE has python3-yamllint, Fedora has just yamllint
 # The following line is generated from dependencies.yaml (upstream)
-%define test_requires %build_requires %test_base_requires perl(YAML::PP) yamllint
+%define test_requires %build_requires %test_base_requires %yamllint_requires perl(YAML::PP)
 # diff from SUSE: dropped perl(Devel::Cover::Report::Codecov) as it's
 # not currently packaged for Fedora
 # The following line is generated from dependencies.yaml (upstream)
@@ -99,7 +96,7 @@ Recommends:     tesseract
 Recommends:     qemu >= 2.0.0
 Recommends:     qemu-kvm
 Recommends:     /usr/bin/qemu-img
-BuildRequires:  %test_requires
+BuildRequires:  %test_requires %test_version_only_requires
 Requires:       %main_requires
 Requires(pre):  %{_bindir}/getent
 Requires(pre):  %{_sbindir}/useradd
@@ -157,14 +154,14 @@ rm -f t/02-test_ocr.t
 rm -f t/07-commands.t
 
 %build
-%cmake -DOS_AUTOINST_DOC_DIR:STRING=%{_docdir}/%{name} -DOS_AUTOINST_DATA_DIR:STRING=libexec/%{name} -GNinja
+%cmake -DOS_AUTOINST_DOC_DIR:STRING=%{_docdir}/%{name} -DSYSTEMD_SERVICE_DIR:STRING="%{_unitdir}" -GNinja
 %ninja_build -C %{__cmake_builddir}
 
 %install
 %ninja_install -C %{__cmake_builddir} install-openvswitch
 # we don't really need to ship this in the package, usually the web UI
 # is much better for needle editing
-rm %{buildroot}%{_libexecdir}/os-autoinst/crop.py*
+rm %{buildroot}%{_prefix}/lib/os-autoinst/crop.py*
 # we're going to %%license this
 rm %{buildroot}%{_pkgdocdir}/COPYING
 ls -lR %buildroot
@@ -175,6 +172,7 @@ find %{buildroot} -depth -type d -and -not -name distri -exec rmdir {} \;
 export NO_BRP_STALE_LINK_ERROR=yes
 
 %check
+export CI=1
 # 00-compile-check-all.t fails if this is present and Perl::Critic is
 # not installed
 rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm
@@ -194,40 +192,44 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm
 %license COPYING
 %{perl_vendorarch}/tinycv.pm
 %{perl_vendorarch}/auto/tinycv
-%dir %{_libexecdir}/os-autoinst
-%{_libexecdir}/os-autoinst/videoencoder
-%{_libexecdir}/os-autoinst/basetest.pm
+%dir %{_prefix}/lib/os-autoinst
+%{_prefix}/lib/os-autoinst/videoencoder
+%{_prefix}/lib/os-autoinst/basetest.pm
 #
-%{_libexecdir}/os-autoinst/dmidata
+%{_prefix}/lib/os-autoinst/dmidata
 #
-%{_libexecdir}/os-autoinst/bmwqemu.pm
-%{_libexecdir}/os-autoinst/commands.pm
-%{_libexecdir}/os-autoinst/distribution.pm
-%{_libexecdir}/os-autoinst/testapi.pm
-%{_libexecdir}/os-autoinst/mmapi.pm
-%{_libexecdir}/os-autoinst/myjsonrpc.pm
-%{_libexecdir}/os-autoinst/lockapi.pm
-%{_libexecdir}/os-autoinst/cv.pm
-%{_libexecdir}/os-autoinst/ocr.pm
-%{_libexecdir}/os-autoinst/osutils.pm
-%{_libexecdir}/os-autoinst/signalblocker.pm
-%{_libexecdir}/os-autoinst/needle.pm
-%{_libexecdir}/os-autoinst/backend
-%{_libexecdir}/os-autoinst/OpenQA
-%{_libexecdir}/os-autoinst/consoles
-%{_libexecdir}/os-autoinst/autotest.pm
+%{_prefix}/lib/os-autoinst/bmwqemu.pm
+%{_prefix}/lib/os-autoinst/commands.pm
+%{_prefix}/lib/os-autoinst/distribution.pm
+%{_prefix}/lib/os-autoinst/testapi.pm
+%{_prefix}/lib/os-autoinst/mmapi.pm
+%{_prefix}/lib/os-autoinst/myjsonrpc.pm
+%{_prefix}/lib/os-autoinst/lockapi.pm
+%{_prefix}/lib/os-autoinst/cv.pm
+%{_prefix}/lib/os-autoinst/ocr.pm
+%{_prefix}/lib/os-autoinst/osutils.pm
+%{_prefix}/lib/os-autoinst/signalblocker.pm
+%{_prefix}/lib/os-autoinst/needle.pm
+%{_prefix}/lib/os-autoinst/backend
+%{_prefix}/lib/os-autoinst/OpenQA
+%{_prefix}/lib/os-autoinst/consoles
+%{_prefix}/lib/os-autoinst/autotest.pm
 %{_bindir}/isotovideo
 %{_bindir}/debugviewer
 %{_bindir}/snd2png
 
 %files openvswitch
-%{_libexecdir}/os-autoinst/os-autoinst-openvswitch
+%{_prefix}/lib/os-autoinst/os-autoinst-openvswitch
 %{_unitdir}/os-autoinst-openvswitch.service
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
 
 %files devel
 
 %changelog
+* Tue Nov 03 2020 Adam Williamson <awilliam@redhat.com> - 4.6-29.20201023gitf54bdea
+- Bump to recent git, resync spec
+- NOTE: moves from /usr/libexec/os-autoinst to /usr/lib/os-autoinst
+
 * Thu Oct 22 2020 Nicolas Chauvet <kwizart@gmail.com> - 4.6-28.20200804gitb781299
 - Rebuilt for OpenCV
 
diff --git a/sources b/sources
index a3be5a2..bde9f49 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-b781299edace8743b63e826d85c4f7a24ac70817.tar.gz) = 17d54760d65de29af1848ac34f3da635e73fd6db3f8dec5a3cf07ec6f2ab5b01a2109fbdc88fef44f66c1a95fef824ccbfc144bd23dac43473822332b25e2c0a
+SHA512 (os-autoinst-f54bdeab5173b70032d1d3fcfe2e86395f6e47c8.tar.gz) = 8855387f283e868b94cdca3dd73643785c3bb49af352e3f5e4692b87b4b0fc009fbbc5a455c11f00bb91f42aaced518c35ca197c3180abe468b602321d4e1bbb