From 733d458b22dd77d5e8711b25a44bbe7d116e5dd23c0fb88d7d509f96f540d4dc Mon Sep 17 00:00:00 2001 From: Oliver Kurz Date: Sat, 7 Dec 2019 05:04:28 +0000 Subject: [PATCH] Offline generation of 4.6.1575621538.1ee59881 4.6.1575621538.1ee59881 OBS-URL: https://build.opensuse.org/package/show/devel:openQA:tested/os-autoinst?expand=0&rev=260 --- os-autoinst-4.6.1575491566.71ee5f56.obscpio | 3 --- os-autoinst-4.6.1575621538.1ee59881.obscpio | 3 +++ os-autoinst-test.spec | 2 +- os-autoinst.changes | 14 ++++++++++++++ os-autoinst.obsinfo | 6 +++--- os-autoinst.spec | 11 +++++++---- 6 files changed, 28 insertions(+), 11 deletions(-) delete mode 100644 os-autoinst-4.6.1575491566.71ee5f56.obscpio create mode 100644 os-autoinst-4.6.1575621538.1ee59881.obscpio diff --git a/os-autoinst-4.6.1575491566.71ee5f56.obscpio b/os-autoinst-4.6.1575491566.71ee5f56.obscpio deleted file mode 100644 index bbd1305..0000000 --- a/os-autoinst-4.6.1575491566.71ee5f56.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6f723c32c501ca91d185bc93651e19295ffad47329fd836d2c164c6b79fc471 -size 24920589 diff --git a/os-autoinst-4.6.1575621538.1ee59881.obscpio b/os-autoinst-4.6.1575621538.1ee59881.obscpio new file mode 100644 index 0000000..a0aa1a2 --- /dev/null +++ b/os-autoinst-4.6.1575621538.1ee59881.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1667f9b8ea84398551b07e60a573f8ff095fee51fa6a535ef5f5393c3494bae6 +size 24928269 diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index 17279b3..1fdc94e 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.1575491566.71ee5f56 +Version: 4.6.1575621538.1ee59881 Release: 0 Summary: test package for os-autoinst #BuildRequires: %{short_name} == %{version} diff --git a/os-autoinst.changes b/os-autoinst.changes index ceaf0f2..1de2323 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Dec 07 05:04:05 UTC 2019 - okurz@suse.com + +- Update to version 4.6.1575621538.1ee59881: + * baseclass.t: Add tests for SSH serial methods + * Use OpenCV 4 under Tumbleweed + * Reduce overly long waiting time on shutdown waiting on processes + * t: Enable 00-compile-check-all.t to be run with prove + * Add simple test for serial_screen.pm + * Add simple test for ssh_screen.pm + * ssh_screen: Fix initialize of base class + * t: Enable 04-check_vars_docu.t to be run with prove + * t: Enable 10-terminal.t to be run with prove + ------------------------------------------------------------------- Wed Dec 04 21:03:59 UTC 2019 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index 92de31a..94511aa 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1575491566.71ee5f56 -mtime: 1575491566 -commit: 71ee5f564e73240e930ed9d2a6fce476e08d16c4 +version: 4.6.1575621538.1ee59881 +mtime: 1575621538 +commit: 1ee59881539d27692858b214055f5399782679fe diff --git a/os-autoinst.spec b/os-autoinst.spec index d2760c1..4da72af 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,17 +17,20 @@ Name: os-autoinst -Version: 4.6.1575491566.71ee5f56 +Version: 4.6.1575621538.1ee59881 Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later Group: Development/Tools/Other URL: https://github.com/os-autoinst/os-autoinst Source0: %{name}-%{version}.tar.xz -# Force OBS to resolve choices on opencv-devel -#!BuildIgnore: opencv3-devel %{perl_requires} -%define build_requires autoconf automake gcc-c++ libtool pkgconfig(opencv) pkg-config perl(Module::CPANfile) pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) make +%if 0%{?sle_version} <= 150100 +%define opencv_require pkgconfig(opencv) +%else +%define opencv_require pkgconfig(opencv4) +%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(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 %define requires_not_needed_in_tests git-core # all requirements needed by the tests, do not require on this in the package