Update to latest upstream git

Signed-off-by: Adam Williamson <awilliam@redhat.com>
f38
Adam Williamson 6 years ago
parent 963b51efba
commit 59d0a96871

@ -17,20 +17,20 @@
# them to the perl vendor dir, but they wouldn't bite.
# https://github.com/os-autoinst/os-autoinst/issues/387
%global __provides_exclude_from %{_libexecdir}/os-autoinst
%global __requires_exclude perl\\((autotest|backend|basetest|bmwqemu|commands|consoles|cv|distribution|lockapi|mmapi|myjsonrpc|needle|ocr|osutils|testapi|OpenQA::Exceptions|OpenQA::Benchmark::Stopwatch)
%global __requires_exclude perl\\((autotest|backend|basetest|bmwqemu|commands|consoles|cv|distribution|lockapi|mmapi|myjsonrpc|needle|ocr|osutils|testapi|OpenQA::Exceptions|OpenQA::Benchmark::Stopwatch|OpenQA::Qemu|OpenQA::Isotovideo)
%{?perl_default_filter}
%global github_owner os-autoinst
%global github_name os-autoinst
%global github_version 4.5
%global github_commit ab8eedab3cbf930dafd1c0c69133d8c52e872bb4
%global github_commit dced72b1424ebac7a2b177fc0a325916047488f2
# if set, will be a post-release snapshot build, otherwise a 'normal' build
%global github_date 20180208
%global github_date 20181113
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
Name: os-autoinst
Version: %{github_version}
Release: 7%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Release: 8%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level test automation
License: GPLv2+
Group: Development/System
@ -60,9 +60,11 @@ BuildRequires: perl(Devel::Cover)
BuildRequires: perl(Pod::Coverage)
# The OO interface to Test::Compile only appeared in 1.1.0
BuildRequires: perl(Test::Compile) >= 1.1.0
BuildRequires: perl(Test::Exception)
BuildRequires: perl(Test::Fatal)
BuildRequires: perl(Test::MockModule)
BuildRequires: perl(Test::Mock::Time)
BuildRequires: perl(Test::Mojo)
BuildRequires: perl(Test::More)
BuildRequires: perl(Test::Output)
BuildRequires: perl(Test::Pod)
@ -81,8 +83,7 @@ Requires: optipng
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Requires: qemu >= 2.0.0
Requires: qemu-kvm
Requires: tesseract
Requires: withlock
Recommends: tesseract
# Not really needed, but you get non-fatal error messages in test
# logs without it: https://bugzilla.redhat.com/show_bug.cgi?id=1467086
Recommends: git
@ -90,15 +91,18 @@ 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(Carp::Always) perl(Data::Dump) perl(Crypt::DES) perl(JSON) perl(JSON::XS) perl(autodie) perl(Class::Accessor::Fast) perl(Exception::Class) 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)
%define t_requires 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)
# [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
# [adamw note]: fullstack test fails with JSON:PP
BuildRequires: %{t_requires}
Requires: %{t_requires}
BuildRequires: perl(Mojolicious)
Requires: perl(Mojolicious) >= 5.60
# specifically versioned things that would otherwise be in t_requires
BuildRequires: perl(Mojolicious) >= 7.92
Requires: perl(Mojolicious) >= 7.92
BuildRequires: perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23
Requires: perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23
#Recommends: eatmydata /usr/bin/multimon
Requires(pre): %{_bindir}/getent
Requires(pre): %{_sbindir}/useradd
@ -129,6 +133,13 @@ This package contains Open vSwitch support for os-autoinst.
rm -f t/99-full-stack.t
sed -i -e 's, 99-full-stack.t,,g' t/Makefile.am
%endif # no_fullstack
# Tesseract 4.0.0 (in Rawhide as of 2018-11) fails utterly to OCR
# the test needle properly:
# https://github.com/tesseract-ocr/tesseract/issues/2052
%if 0%{?fedora} > 29
rm -f t/02-test_ocr.t
sed -i -e 's, 02-test_ocr.t,,g' t/Makefile.am
%endif # fedora > 29
%build
mkdir -p m4
@ -143,6 +154,7 @@ sed -i 's/ my $thisversion = qx{git rev-parse HEAD};/ my $thisversion = "%{vers
# only internal stuff
rm %{buildroot}%{_libexecdir}/os-autoinst/tools/tidy
rm -r %{buildroot}%{_libexecdir}/os-autoinst/tools/lib/perlcritic
rm %{buildroot}%{_libexecdir}/os-autoinst/tools/absolutize
rm %{buildroot}%{_libexecdir}/os-autoinst/tools/check_coverage
# we don't really need to ship this in the package, usually the web UI
# is much better for needle editing
@ -200,7 +212,6 @@ make check VERBOSE=1
%{_libexecdir}/os-autoinst/OpenQA
%{_libexecdir}/os-autoinst/consoles
%dir %{_libexecdir}/os-autoinst/tools
%{_libexecdir}/os-autoinst/tools/absolutize
%{_libexecdir}/os-autoinst/tools/preparepool
%{_libexecdir}/os-autoinst/autotest.pm
%{_bindir}/isotovideo
@ -213,6 +224,11 @@ make check VERBOSE=1
%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf
%changelog
* Wed Nov 14 2018 Adam Williamson <awilliam@redhat.com> - 4.5-8.2018113gitdced72b
- Bump to latest git
- Resync with upstream spec
- Disable OCR test on Rawhide as Tesseract 4.0.0 sucks
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.5-7.20180208gitab8eeda
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Loading…
Cancel
Save