From c8ad29cd7639d7515c783b9bb95fb139642c859d Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 15 Oct 2019 14:48:59 -0700 Subject: [PATCH] Bump to slightly newer git snapshot to build with OpenCV 4.1 --- .gitignore | 1 + os-autoinst.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index aab60c9..05e1241 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ /os-autoinst-43185de17bd3b9462fa9529433450a3f031079c2.tar.gz /os-autoinst-c3d5e8ac168f5976ca488559d489bbcfa737422a.tar.gz /os-autoinst-c597122986fb779fe5985a96c2d73aa03e2d4b15.tar.gz +/os-autoinst-3391d604ae36c0db0cda1d38f170137aef486a0c.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index bbb3341..b582b30 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -28,14 +28,14 @@ %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.5 -%global github_commit c597122986fb779fe5985a96c2d73aa03e2d4b15 +%global github_commit 3391d604ae36c0db0cda1d38f170137aef486a0c # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20190806 +%global github_date 20190807 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 24%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 25%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -103,7 +103,7 @@ Recommends: git # Requires: for most of them, but we'd still have to add BuildRequires, # so we may as well follow the SUSE spec's approach here to make it # easier to resync with SUSE's spec... -%define t_requires perl(B::Deparse) perl(Carp::Always) perl(Data::Dump) perl(Crypt::DES) perl(JSON) perl(autodie) perl(Class::Accessor::Fast) perl(Exception::Class) perl(File::Touch) perl(File::Which) perl(IPC::Run::Debug) perl(Net::DBus) perl(Net::SNMP) perl(Net::IP) perl(IPC::System::Simple) perl(Net::SSH2) perl(XML::LibXML) perl(XML::SemanticDiff) perl(JSON::XS) perl(List::MoreUtils) perl(Socket::MsgHdr) perl(Cpanel::JSON::XS) perl(IO::Scalar) +%define t_requires perl(B::Deparse) perl(Carp::Always) perl(Data::Dump) perl(Data::Dumper) perl(Crypt::DES) perl(JSON) perl(autodie) perl(Class::Accessor::Fast) perl(Exception::Class) perl(File::Touch) perl(File::Which) perl(IPC::Run::Debug) perl(Net::DBus) perl(Net::SNMP) perl(Net::IP) perl(IPC::System::Simple) perl(Net::SSH2) perl(XML::LibXML) perl(XML::SemanticDiff) perl(JSON::XS) perl(List::MoreUtils) perl(Socket::MsgHdr) perl(Cpanel::JSON::XS) perl(IO::Scalar) # [note from openSUSE spec regarding JSON::XS dependency]: # we shuffle around a lot of JSON, so make sure this is fast # and the JSON modules have subtle differences and we only test against XS in production @@ -240,6 +240,9 @@ make check VERBOSE=1 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf %changelog +* Tue Oct 15 2019 Adam Williamson - 4.5-25.20190806git3391d60 +- Bump to slightly newer git snapshot to build with OpenCV 4.1 + * Wed Aug 21 2019 Adam Williamson - 4.5-24.20190806gitc597122 - Backport PR #1199 to improve validate_script_output result display diff --git a/sources b/sources index c7483c6..b97a2be 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-c597122986fb779fe5985a96c2d73aa03e2d4b15.tar.gz) = 155627528b916aeffe48f74987ddaa9f8f714e564bcd12c5566a0db9527a2cdbf82cd240b6ba6e7affecc6e9f2339426a079ee351c639e968e68133b4fd97b4d +SHA512 (os-autoinst-3391d604ae36c0db0cda1d38f170137aef486a0c.tar.gz) = 934667774fbdb06b89e760ae907a9000e00d5ecfe67346c9c6a6510d8fad8cd911e92b839a6b83e6eaa23c8fe8a736765243d339edc693cb08804501d61fb962