diff --git a/.gitignore b/.gitignore index e99b82c..436208f 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ /os-autoinst-5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4.tar.gz /os-autoinst-b781299edace8743b63e826d85c4f7a24ac70817.tar.gz /os-autoinst-f54bdeab5173b70032d1d3fcfe2e86395f6e47c8.tar.gz +/os-autoinst-496edb5a0cf96c791a727f227c204722ae141bdf.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index 16a869b..d8a2572 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -31,14 +31,14 @@ %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.6 -%global github_commit f54bdeab5173b70032d1d3fcfe2e86395f6e47c8 +%global github_commit 496edb5a0cf96c791a727f227c204722ae141bdf # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20201023 +%global github_date 20210210 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 30%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 32%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -50,7 +50,6 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith %define opencv_require pkgconfig(opencv) # The following line is generated from dependencies.yaml (upstream) %define build_base_requires %opencv_require gcc-c++ perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) -%define build_legacy_requires %build_base_requires autoconf automake libtool make perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) >= 6.66 perl(Module::CPANfile) # diff from SUSE: SUSE has 'ninja', Fedora has 'ninja-build' # The following line is generated from dependencies.yaml (upstream) %define build_requires %build_base_requires cmake ninja-build @@ -71,11 +70,10 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith # 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::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 +%define test_base_requires %main_requires perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) 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 # The following line is generated from dependencies.yaml (upstream) %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 @@ -226,6 +224,12 @@ rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm %files devel %changelog +* Wed Feb 10 2021 Adam Williamson - 4.6-32.20210210git496edb5 +- Bump to latest git again (inc. correct fix for a test issue) + +* Tue Feb 09 2021 Adam Williamson - 4.6-31.20210209git2e2b378 +- Bump to latest git, resync spec + * Tue Jan 26 2021 Fedora Release Engineering - 4.6-30.20201023gitf54bdea - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index bde9f49..9a5de6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-f54bdeab5173b70032d1d3fcfe2e86395f6e47c8.tar.gz) = 8855387f283e868b94cdca3dd73643785c3bb49af352e3f5e4692b87b4b0fc009fbbc5a455c11f00bb91f42aaced518c35ca197c3180abe468b602321d4e1bbb +SHA512 (os-autoinst-496edb5a0cf96c791a727f227c204722ae141bdf.tar.gz) = cee896416d9b8b53aa4e8f5df1d73fad442685762d1f0d353b8f542c24c9de4f1f4a9f8ca413344e620cb97e363c759af7d55829c48656c71365534e79d1320b