From 2262398f904661d194eed5d8a7ef49be9c03396467e890628b13065387a46dab Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Tue, 14 Jan 2020 06:49:40 +0000 Subject: [PATCH] Offline generation of 4.6.1578910353.e34101c6 4.6.1578910353.e34101c6 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/os-autoinst?expand=0&rev=279 --- os-autoinst-4.6.1578638802.5822dfa3.obscpio | 3 --- os-autoinst-4.6.1578910353.e34101c6.obscpio | 3 +++ os-autoinst-test.spec | 2 +- os-autoinst.changes | 7 +++++++ os-autoinst.obsinfo | 6 +++--- os-autoinst.spec | 9 +++++---- 6 files changed, 19 insertions(+), 11 deletions(-) delete mode 100644 os-autoinst-4.6.1578638802.5822dfa3.obscpio create mode 100644 os-autoinst-4.6.1578910353.e34101c6.obscpio diff --git a/os-autoinst-4.6.1578638802.5822dfa3.obscpio b/os-autoinst-4.6.1578638802.5822dfa3.obscpio deleted file mode 100644 index ff05c38..0000000 --- a/os-autoinst-4.6.1578638802.5822dfa3.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1f6c2dd991177424bb3aed2f13df76f04cf7388fa0faf33b44035152b840166 -size 24939533 diff --git a/os-autoinst-4.6.1578910353.e34101c6.obscpio b/os-autoinst-4.6.1578910353.e34101c6.obscpio new file mode 100644 index 0000000..a3247d4 --- /dev/null +++ b/os-autoinst-4.6.1578910353.e34101c6.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72c603576b7560f5b21c1c1e9ecce6c627a311065526dffaadfa61ac480280ee +size 24939533 diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index 53f8a3a..8a2824f 100644 --- a/os-autoinst-test.spec +++ b/os-autoinst-test.spec @@ -19,7 +19,7 @@ %define name_ext -test %define short_name os-autoinst Name: %{short_name}%{?name_ext} -Version: 4.6.1578638802.5822dfa3 +Version: 4.6.1578910353.e34101c6 Release: 0 Summary: test package for os-autoinst #BuildRequires: %{short_name} == %{version} diff --git a/os-autoinst.changes b/os-autoinst.changes index 83a0f18..7c747d6 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 14 06:49:24 UTC 2020 - okurz@suse.com + +- Update to version 4.6.1578910353.e34101c6: + * qemu: Allow to configure maximum file migration time + * Fix condition for using pkgconfig(opencv4) + ------------------------------------------------------------------- Sat Jan 11 22:49:28 UTC 2020 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index a64ae44..bb6c54a 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1578638802.5822dfa3 -mtime: 1578638802 -commit: 5822dfa3281221ae31a713c39cc7f8a1b7db5184 +version: 4.6.1578910353.e34101c6 +mtime: 1578910353 +commit: e34101c6028116a050e6d2e1ac5c927fce3c3647 diff --git a/os-autoinst.spec b/os-autoinst.spec index 81df05c..9976fb8 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1578638802.5822dfa3 +Version: 4.6.1578910353.e34101c6 Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -25,10 +25,11 @@ Group: Development/Tools/Other URL: https://github.com/os-autoinst/os-autoinst Source0: %{name}-%{version}.tar.xz %{perl_requires} -%if 0%{?sle_version} <= 150100 -%define opencv_require pkgconfig(opencv) -%else +%if 0%{?suse_version} > 1500 +# openSUSE Tumbleweed %define opencv_require pkgconfig(opencv4) +%else +%define opencv_require pkgconfig(opencv) %endif %define build_requires autoconf automake gcc-c++ libtool pkg-config perl(Module::CPANfile) pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) make %opencv_require %define requires perl(B::Deparse) perl(Mojolicious) >= 7.92, perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23, 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(IO::Socket::INET) 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(Mojo::IOLoop::ReadWriteProcess) perl(Socket::MsgHdr) perl(Cpanel::JSON::XS) perl(IO::Scalar) perl(Try::Tiny) perl-base