From 1de4c5f040f6a0b615780ddd7ec5d68556852d23 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 24 Jun 2020 17:43:03 -0700 Subject: [PATCH] Bump to latest git, resync spec again --- .gitignore | 1 + os-autoinst.spec | 15 ++++++++------- sources | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index c17cf93..61e6f62 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ /os-autoinst-85fa4f12c1fb5bed7295791801085d32a69d4586.tar.gz /os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz /os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz +/os-autoinst-5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index 41b4d87..37d730c 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 f38e8b174dc1a0cace4d624a197a297f9efdc2bb +%global github_commit 5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20200610 +%global github_date 20200623 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 17%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 18%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -61,10 +61,8 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith %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.23 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) # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages -# diff from SUSE: replaced qemu-tools with qemu-img, replaced qemu-x86 -# with qemu-system-i386, dropped spellcheck requirement stuff as this -# isn't needed in package builds IMO, dropped critic stuff as we don't -# run those tests in our build +# 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_requires %build_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 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img /usr/bin/qemu-system-i386 # diff from SUSE: dropped perl(Devel::Cover::Report::Codecov) as it's @@ -229,6 +227,9 @@ make test VERBOSE=1 %files devel %changelog +* Wed Jun 24 2020 Adam Williamson - 4.6-18.20200624git5038d8c2 +- Bump to latest git, resync spec again + * Fri Jun 12 2020 Adam Williamson - 4.6-17.20200610gitf38e8b17 - Drop -devel dep that doesn't exist in Fedora diff --git a/sources b/sources index 4a5d9d1..56a9760 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz) = 5b6f1f7677b136f8fce66af92d468eb334cfb7d24cdb2622b3fbecc7aae8b069ecb969e5e35c22173f19470bf79d97503a8b82e372518ad0a6031e5f6d70779b +SHA512 (os-autoinst-5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4.tar.gz) = 0483646b4d21aae24034d944a9095aaae751883912d620439309198f4ff8ec591d1015a1c478eb142d9e4be0b93d511151af1ed993855505fe4d7557574669f9