From afeb766c64bcacc05d58477f7bceaada631b8848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 1 Apr 2020 16:55:04 +0200 Subject: [PATCH 1/3] Add more Perl dependencies --- os-autoinst.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/os-autoinst.spec b/os-autoinst.spec index abe8adc..4900d27 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -35,7 +35,7 @@ Name: os-autoinst Version: %{github_version} -Release: 8%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 9%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -45,7 +45,7 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith %define build_requires autoconf automake gcc-c++ libtool pkgconfig(opencv) pkg-config perl(ExtUtils::MakeMaker) perl(ExtUtils::Embed) perl(Module::CPANfile) pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) make # diff from SUSE: dropped perl-base which does not exist in Fedora, we have # the perl(:MODULE_COMPAT) require below -%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) +%define requires perl(base) perl(B::Deparse) perl(Carp) perl(Cwd) perl(English) perl(Errno) perl(Fcntl) perl(File::Temp) perl(integer) 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(POSIX) perl(strict) perl(Time::HiRes) perl(warnings) perl(XML::LibXML) perl(XML::SemanticDiff) perl(JSON::XS) perl(List::MoreUtils) perl(Mojo::IOLoop::ReadWriteProcess) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Cpanel::JSON::XS) perl(IO::Scalar) perl(Try::Tiny) %define requires_not_needed_in_tests git-core # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages @@ -61,10 +61,13 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: systemd +BuildRequires: perl(FindBin) %if 0%{?no_fullstack} %else BuildRequires: perl(Mojo::File) %endif # no_fullstack +BuildRequires: perl(Mojo::JSON) +BuildRequires: perl(Mojo::Log) # tinycv is a compiled public module, so we should have this Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Recommends: tesseract @@ -208,6 +211,9 @@ make check test VERBOSE=1 CHECK_DOC=0 %files devel %changelog +* Wed Apr 01 2020 Petr Pisar - 4.6-9.20190205git63af2f4 +- Add more Perl dependencies + * Wed Feb 05 2020 Adam Williamson - 4.6-8.20200205git63af2f4f - Bump to latest git From c668cb57710b35b08c546103ff3f0edcbacbe396 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Apr 2020 17:05:01 -0700 Subject: [PATCH 2/3] Bump to latest upstream git Various fixes, enhancements etc. --- .gitignore | 1 + os-autoinst.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 84360e9..49b2e14 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ /os-autoinst-75fbe1d37699c43909b6c1cb698decdebf4849d7.tar.gz /os-autoinst-d693abe082d6559721e5053d8fd6151753c73020.tar.gz /os-autoinst-63af2f4f91cfad88712bd0773e0a236d6e3853ea.tar.gz +/os-autoinst-50464d4e81fcac9dd36785ba88f69b489e4e99e7.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index 4900d27..6f3cf95 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.6 -%global github_commit 63af2f4f91cfad88712bd0773e0a236d6e3853ea +%global github_commit 50464d4e81fcac9dd36785ba88f69b489e4e99e7 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20190205 +%global github_date 20200414 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 9%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 10%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -211,9 +211,15 @@ make check test VERBOSE=1 CHECK_DOC=0 %files devel %changelog -* Wed Apr 01 2020 Petr Pisar - 4.6-9.20190205git63af2f4 +* Wed Apr 15 2020 Adam Williamson - 4.6-10.20200414git50464d4e +- Bump to latest git + +* Wed Apr 01 2020 Petr Pisar - Add more Perl dependencies +* Wed Mar 11 2020 Adam Williamson - 4.6-9.20200311git4e3dec50 +- Bump to latest git + * Wed Feb 05 2020 Adam Williamson - 4.6-8.20200205git63af2f4f - Bump to latest git diff --git a/sources b/sources index 34ec0c5..cfafc25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-63af2f4f91cfad88712bd0773e0a236d6e3853ea.tar.gz) = 37bd3f6f474fb6cb491268dd68351c337691c8cba6d22594186c75b6b530a49291d1020a96b8a5d615017b1e8b1f7d639c832949488fad82503beba1158a8651 +SHA512 (os-autoinst-50464d4e81fcac9dd36785ba88f69b489e4e99e7.tar.gz) = 05402eaeff36d6a7ffefa306c7f1b9146d0227a87850a56a4c0b9f3e731e34a2222f51e78b6afb00637ab460dd281fba6bcdd3ce7c2625916226d6695569545e From 07749749262fc0558381aff8d98197ae17da4458 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Apr 2020 17:17:24 -0700 Subject: [PATCH 3/3] Rearrange the requires ppisar added into the macros Signed-off-by: Adam Williamson --- os-autoinst.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/os-autoinst.spec b/os-autoinst.spec index 6f3cf95..788c3a8 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -35,7 +35,7 @@ Name: os-autoinst Version: %{github_version} -Release: 10%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 11%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ URL: https://os-autoinst.github.io/openQA/ @@ -45,7 +45,8 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith %define build_requires autoconf automake gcc-c++ libtool pkgconfig(opencv) pkg-config perl(ExtUtils::MakeMaker) perl(ExtUtils::Embed) perl(Module::CPANfile) pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc) make # diff from SUSE: dropped perl-base which does not exist in Fedora, we have # the perl(:MODULE_COMPAT) require below -%define requires perl(base) perl(B::Deparse) perl(Carp) perl(Cwd) perl(English) perl(Errno) perl(Fcntl) perl(File::Temp) perl(integer) 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(POSIX) perl(strict) perl(Time::HiRes) perl(warnings) perl(XML::LibXML) perl(XML::SemanticDiff) perl(JSON::XS) perl(List::MoreUtils) perl(Mojo::IOLoop::ReadWriteProcess) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Cpanel::JSON::XS) perl(IO::Scalar) perl(Try::Tiny) +# also a bunch of stuff ppisar added +%define requires perl(base) perl(B::Deparse) perl(Carp) perl(Cwd) perl(English) perl(Errno) perl(Fcntl) perl(File::Temp) perl(integer) perl(Mojolicious) >= 7.92, perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23, perl(Mojo::JSON) perl(Mojo::Log) 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(POSIX) perl(strict) perl(Time::HiRes) perl(warnings) perl(XML::LibXML) perl(XML::SemanticDiff) perl(JSON::XS) perl(List::MoreUtils) perl(Mojo::IOLoop::ReadWriteProcess) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Cpanel::JSON::XS) perl(IO::Scalar) perl(Try::Tiny) %define requires_not_needed_in_tests git-core # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages @@ -55,19 +56,16 @@ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{gith # these disabled as qemu can't run in OBS apparently), dropped spell # check requirement stuff as this isn't needed in package builds IMO # perl(Test::Strict) added, upstream should have this too -%define test_requires %build_requires %requires perl(Perl::Tidy) perl(Test::Compile) >= 1.1.0, perl(Test::Exception) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Fatal) perl(Test::Warnings) perl(Test::Strict) perl(Pod::Coverage) perl(Test::Pod) perl(Test::MockModule) perl(Test::MockObject) perl(Devel::Cover) perl(Test::Mock::Time) /usr/bin/qemu-img /usr/bin/qemu-system-i386 +%define test_requires %build_requires %requires perl(Perl::Tidy) perl(Test::Compile) >= 1.1.0, perl(Test::Exception) perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Fatal) perl(Test::Warnings) perl(Test::Strict) perl(Pod::Coverage) perl(Test::Pod) perl(Test::MockModule) perl(Test::MockObject) perl(Devel::Cover) perl(Test::Mock::Time) perl(FindBin) /usr/bin/qemu-img /usr/bin/qemu-system-i386 %define devel_requires %test_requires %requires_not_needed_in_tests BuildRequires: perl-devel BuildRequires: perl-generators BuildRequires: systemd -BuildRequires: perl(FindBin) %if 0%{?no_fullstack} %else BuildRequires: perl(Mojo::File) %endif # no_fullstack -BuildRequires: perl(Mojo::JSON) -BuildRequires: perl(Mojo::Log) # tinycv is a compiled public module, so we should have this Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Recommends: tesseract @@ -211,6 +209,9 @@ make check test VERBOSE=1 CHECK_DOC=0 %files devel %changelog +* Fri Apr 17 2020 Adam Williamson - 4.6-11.20200414git50464d4e +- Rearrange the dependencies ppisar added + * Wed Apr 15 2020 Adam Williamson - 4.6-10.20200414git50464d4e - Bump to latest git