diff --git a/.gitignore b/.gitignore index a4f7d9d..80e90e5 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /os-autoinst-3391d604ae36c0db0cda1d38f170137aef486a0c.tar.gz /os-autoinst-447dab862096c5fb871fe06f61c3e5249ec0d5c1.tar.gz /os-autoinst-75fbe1d37699c43909b6c1cb698decdebf4849d7.tar.gz +/os-autoinst-d693abe082d6559721e5053d8fd6151753c73020.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index 01b6fe6..13427bb 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -28,19 +28,18 @@ %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.6 -%global github_commit 75fbe1d37699c43909b6c1cb698decdebf4849d7 +%global github_commit d693abe082d6559721e5053d8fd6151753c73020 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20191121 +%global github_date 20191226 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 4%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 5%{?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 -Patch0: os-autoinst-opencv_header.patch # diff from SUSE: added perl(ExtUtils::MakeMaker) and perl(ExtUtils::Embed) # which I've found necessary before %define build_requires autoconf automake gcc-c++ libtool pkgconfig(opencv) pkg-config perl(ExtUtils::MakeMaker) perl(ExtUtils::Embed) perl(Module::CPANfile) pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) make @@ -53,8 +52,10 @@ Patch0: os-autoinst-opencv_header.patch # diff from SUSE: added perl(Test::Mojo) and perl(Test::More), replaced # qemu-tools with qemu-img, added /usr/bin/qemu-system-i386 which # 'fullstack' and 'qemu-options' tests use on all arches (SUSE has -# these disabled as qemu can't run in OBS apparently) -%define test_requires %build_requires %requires perl(Perl::Tidy) perl(Test::Compile) >= 1.1.0, perl(Test::Exception) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Fatal) perl(Test::Warnings) perl(Pod::Coverage) perl(Test::Pod) perl(Test::MockModule) perl(Test::MockObject) perl(Devel::Cover) perl(Test::Mock::Time) /usr/bin/qemu-img /usr/bin/qemu-system-i386 +# these disabled as qemu can't run in OBS apparently), dropped spell +# check requirement stuff as this isn't needed in package builds IMO +# perl(Test::Strict) added, upstream should have this too +%define test_requires %build_requires %requires perl(Perl::Tidy) perl(Test::Compile) >= 1.1.0, perl(Test::Exception) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Fatal) perl(Test::Warnings) perl(Test::Strict) perl(Pod::Coverage) perl(Test::Pod) perl(Test::MockModule) perl(Test::MockObject) perl(Devel::Cover) perl(Test::Mock::Time) /usr/bin/qemu-img /usr/bin/qemu-system-i386 %define devel_requires %test_requires %requires_not_needed_in_tests BuildRequires: perl-devel @@ -108,18 +109,18 @@ This package contains Open vSwitch support for os-autoinst. sed -i 's/ my $thisversion = qx{git.*rev-parse HEAD}.*;/ my $thisversion = "%{version}";/' isotovideo %if 0%{?no_fullstack} rm -f t/99-full-stack.t -sed -i -e '/99-full-stack.t/d' t/Makefile.am +sed -i -e '/99-full-stack.t/d' Makefile.am %endif # no_fullstack %if 0%{?no_options} rm -f t/18-qemu-options.t -sed -i -e '/18-qemu-options.t/d' t/Makefile.am +sed -i -e '/18-qemu-options.t/d' Makefile.am %endif # Tesseract 4.0.0 (in Rawhide as of 2018-11) fails utterly to OCR # the test needle properly: # https://github.com/tesseract-ocr/tesseract/issues/2052 %if 0%{?fedora} > 29 rm -f t/02-test_ocr.t -sed -i -e '/02-test_ocr.t/d' t/Makefile.am +sed -i -e '/02-test_ocr.t/d' Makefile.am %endif # fedora > 29 %build @@ -153,7 +154,7 @@ sed '/perlcritic/d' -i Makefile sed '/Perl::Critic/d' -i cpanfile sed '/tidy/d' -i Makefile rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm -make check VERBOSE=1 +make check test VERBOSE=1 CHECK_DOC=0 %post openvswitch %systemd_post os-autoinst-openvswitch.service @@ -204,6 +205,9 @@ make check VERBOSE=1 %files devel %changelog +* Thu Jan 02 2020 Adam Williamson - 4.6-5.20191226gitd693abe0 +- Bump to latest git + * Sun Dec 29 2019 Nicolas Chauvet - 4.6-4.20191121git75fbe1d - Rebuilt for opencv4 diff --git a/sources b/sources index 28cb2a8..d440686 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-75fbe1d37699c43909b6c1cb698decdebf4849d7.tar.gz) = f07bea739b9c4cbabe17b9fb4aa17b1adbd51a7f5b398675e560172e3996a41c3bca17b73dce1a0e8819b8ee0ed249086774bbc4bee6977e18ac63beb8310908 +SHA512 (os-autoinst-d693abe082d6559721e5053d8fd6151753c73020.tar.gz) = dcba9f0c90e1b88621eeb916cc299f2eca79dc0be547e58db9ed215a456328eefcd1cb7126504875369da95bc55d487974200616b01b8369c009e47a74ba97dc