diff --git a/.gitignore b/.gitignore index 135f7df..bc60a10 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /os-autoinst-436f134262416559c5b7248d4246cbfed67ae835.tar.gz /os-autoinst-5a76fb8e636ccc4fdf22b7738caae6aa40895920.tar.gz /os-autoinst-6802f4479120a2954adbfba6dbe2779842c5ac91.tar.gz +/os-autoinst-1946eb18d76980581d842e1e2569dee33e5a5b45.tar.gz diff --git a/0001-Drop-setting-of-TESSDATA_PREFIX-in-invoke-tests.patch b/0001-Drop-setting-of-TESSDATA_PREFIX-in-invoke-tests.patch deleted file mode 100644 index fad3868..0000000 --- a/0001-Drop-setting-of-TESSDATA_PREFIX-in-invoke-tests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9ad6aff94093ee4fcc9231cd3eadd4c0934e2216 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Wed, 19 Apr 2023 16:12:15 -0700 -Subject: [PATCH] Drop setting of TESSDATA_PREFIX in invoke-tests - -It's not appropriate to do this here. This is not the right path -on all distros. Forcing this path here makes it impossible to run -the tests successfully on e.g. Fedora, where the tesseract data -is in /usr/share/tesseract/tessdata (and there is no need to -explicitly specify this, as tesseract is built to find it there -without any such specification). - -Signed-off-by: Adam Williamson ---- - tools/invoke-tests | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/tools/invoke-tests b/tools/invoke-tests -index 15e6593b..8f7de0cc 100755 ---- a/tools/invoke-tests -+++ b/tools/invoke-tests -@@ -52,9 +52,6 @@ fi - export OS_AUTOINST_BUILD_DIRECTORY=$build_directory - export OS_AUTOINST_MAKE_TOOL=$make_path - --# set TESSDATA_PREFIX for 02-test_ocr.t --export TESSDATA_PREFIX='/usr/share/tessdata/' -- - args=() - # use unbuffer if it was found so e.g. timestamps on OBS builds will be useful - # note: When executing tests with prove it seems that the output is only flushed after one test has finished unless there's a terminal. --- -2.40.0 - diff --git a/os-autoinst.spec b/os-autoinst.spec index 51e6a51..c7e505f 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -30,9 +30,9 @@ %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.6 -%global github_commit 6802f4479120a2954adbfba6dbe2779842c5ac91 +%global github_commit 1946eb18d76980581d842e1e2569dee33e5a5b45 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20230418 +%global github_date 20230527 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst @@ -42,9 +42,6 @@ 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 -# https://github.com/os-autoinst/os-autoinst/pull/2303 -# Fix tests with Fedora tesseract data location -Patch0: 0001-Drop-setting-of-TESSDATA_PREFIX-in-invoke-tests.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 @@ -99,6 +96,8 @@ Recommends: tesseract Recommends: qemu >= 4.0.0 Recommends: qemu-kvm Recommends: /usr/bin/qemu-img +# For chattr, see SUSE 'qemu_requires' +Recommends: e2fsprogs # Optional dependency for Python test API support Recommends: perl(Inline::Python) BuildRequires: %test_requires %test_version_only_requires @@ -244,6 +243,9 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm %files devel %changelog +* Fri May 26 2023 Adam Williamson - 4.6^20230527git1946eb1-1 +- Update to latest git, drop merged patch, sync spec + * Wed Apr 19 2023 Adam Williamson - 4.6^20230418git6802f44-1 - Update to latest git, re-enable OCR tests diff --git a/sources b/sources index dd37e0e..7b9fe54 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-6802f4479120a2954adbfba6dbe2779842c5ac91.tar.gz) = d903cb9e628a58ecc45a52a4c58060c62e6f854e4ef4b72a92836088cc3f5738a61f1d31c371b649de36c4a2075b7b9a78fdf9dc77e5f561d98dd0c20ef7a7ca +SHA512 (os-autoinst-1946eb18d76980581d842e1e2569dee33e5a5b45.tar.gz) = add28e23c1c32e50e191f6afcc99f7e75d550a3b398b97586989f9a828298fe8088e7d2a749a2d4c5a984f165ca95548e3420eefd08ccd34c51c1b4b7cbf87b1