The package rpms/os-autoinst.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/os-autoinst.git/commit/?id=1fb091....
Change:
+%ifarch %{arm} s390x
Thanks.
Full change:
============
commit 1de4c5f040f6a0b615780ddd7ec5d68556852d23
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Jun 24 17:43:03 2020 -0700
Bump to latest git, resync spec again
diff --git a/.gitignore b/.gitignore
index c17cf93..61e6f62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@
/os-autoinst-85fa4f12c1fb5bed7295791801085d32a69d4586.tar.gz
/os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz
/os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz
+/os-autoinst-5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4.tar.gz
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 41b4d87..37d730c 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -31,14 +31,14 @@
%global github_owner os-autoinst
%global github_name os-autoinst
%global github_version 4.6
-%global github_commit f38e8b174dc1a0cace4d624a197a297f9efdc2bb
+%global github_commit 5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20200610
+%global github_date 20200623
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
Name: os-autoinst
Version: %{github_version}
-Release: 17%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 18%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL:
https://os-autoinst.github.io/openQA/
@@ -61,10 +61,8 @@ Source0:
https://github.com/%{github_owner}/%{github_name}/archive/%{gith
%define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp)
perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS)
perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader)
perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib)
perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec)
perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar)
perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX)
perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils)
perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23 perl(Mojo::JSON)
perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42
perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2)
perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor)
perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML)
perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict)
perl(warnings)
# all requirements needed by the tests, do not require on this in the package
# itself or any sub-packages
-# diff from SUSE: replaced qemu-tools with qemu-img, replaced qemu-x86
-# with qemu-system-i386, dropped spellcheck requirement stuff as this
-# isn't needed in package builds IMO, dropped critic stuff as we don't
-# run those tests in our build
+# diff from SUSE: replaced qemu with qemu-kvm, qemu-tools with
+# qemu-img, and qemu-x86 with qemu-system-i386
# The following line is generated from dependencies.yaml (upstream)
%define test_requires %build_requires %main_requires perl(Benchmark) perl(Devel::Cover)
perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal)
perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo)
perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict)
perl(Test::Warnings) >= 0.029 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img
/usr/bin/qemu-system-i386
# diff from SUSE: dropped perl(Devel::Cover::Report::Codecov) as it's
@@ -229,6 +227,9 @@ make test VERBOSE=1
%files devel
%changelog
+* Wed Jun 24 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-18.20200624git5038d8c2
+- Bump to latest git, resync spec again
+
* Fri Jun 12 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-17.20200610gitf38e8b17
- Drop -devel dep that doesn't exist in Fedora
diff --git a/sources b/sources
index 4a5d9d1..56a9760 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz) =
5b6f1f7677b136f8fce66af92d468eb334cfb7d24cdb2622b3fbecc7aae8b069ecb969e5e35c22173f19470bf79d97503a8b82e372518ad0a6031e5f6d70779b
+SHA512 (os-autoinst-5038d8c2e04d923a8e7d616ea4b88a9ba3af6fb4.tar.gz) =
0483646b4d21aae24034d944a9095aaae751883912d620439309198f4ff8ec591d1015a1c478eb142d9e4be0b93d511151af1ed993855505fe4d7557574669f9
commit 5a5527238eee0f31bb229f4a7dc7a9fdc3386ccd
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Fri Jun 12 14:08:36 2020 -0700
Drop -devel dep that doesn't exist in Fedora
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 49a1264..41b4d87 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -38,7 +38,7 @@
Name: os-autoinst
Version: %{github_version}
-Release: 16%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 17%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL:
https://os-autoinst.github.io/openQA/
@@ -67,8 +67,10 @@ Source0:
https://github.com/%{github_owner}/%{github_name}/archive/%{gith
# run those tests in our build
# The following line is generated from dependencies.yaml (upstream)
%define test_requires %build_requires %main_requires perl(Benchmark) perl(Devel::Cover)
perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal)
perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo)
perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict)
perl(Test::Warnings) >= 0.029 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img
/usr/bin/qemu-system-i386
+# diff from SUSE: dropped perl(Devel::Cover::Report::Codecov) as it's
+# not currently packaged for Fedora
# The following line is generated from dependencies.yaml (upstream)
-%define devel_requires %test_requires perl(Devel::Cover)
perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy)
+%define devel_requires %test_requires perl(Devel::Cover) perl(Perl::Tidy)
BuildRequires: perl-devel
BuildRequires: perl-generators
@@ -227,6 +229,9 @@ make test VERBOSE=1
%files devel
%changelog
+* Fri Jun 12 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-17.20200610gitf38e8b17
+- Drop -devel dep that doesn't exist in Fedora
+
* Wed Jun 10 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-16.20200610gitf38e8b17
- Bump to latest git, resync spec again
commit 55b14a1de7105a9af36d14f4138b27bb436feb96
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Wed Jun 10 11:48:35 2020 -0700
Bump to latest git, resync spec again
diff --git a/.gitignore b/.gitignore
index 450b363..c17cf93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,3 +41,4 @@
/os-autoinst-50464d4e81fcac9dd36785ba88f69b489e4e99e7.tar.gz
/os-autoinst-85fa4f12c1fb5bed7295791801085d32a69d4586.tar.gz
/os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz
+/os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 3927ad9..49a1264 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -31,14 +31,14 @@
%global github_owner os-autoinst
%global github_name os-autoinst
%global github_version 4.6
-%global github_commit bcbc6c412cbd69ab461d5448f8bf08b5371a0adb
+%global github_commit f38e8b174dc1a0cace4d624a197a297f9efdc2bb
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20200608
+%global github_date 20200610
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
Name: os-autoinst
Version: %{github_version}
-Release: 15%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 16%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL:
https://os-autoinst.github.io/openQA/
@@ -48,45 +48,27 @@ Source0:
https://github.com/%{github_owner}/%{github_name}/archive/%{gith
# still use a macro just to keep build_requires similar for ease of
# cross-comparison
%define opencv_require pkgconfig(opencv)
-# this is stuff we added to build_requires, we put it in its own macro
-# to make resyncing with upstream spec changes easier. Upstream put
-# MakeMaker in main_requires for some reason but it is clearly a build
-# requirement:
-#
https://github.com/os-autoinst/os-autoinst/pull/1435
-# Pod::Html is needed to run pod2html as part of doc build, it used to
-# be pulled in as a dep of Perl::Tidy but that's not explicitly listed
-# in test_requires any more:
-#
https://github.com/os-autoinst/os-autoinst/pull/1437
-%define build_requires_additional perl(ExtUtils::MakeMaker) >= 7.12 perl(Pod::Html)
-# diff from SUSE: added build_requires_additional
# The following line is generated from dependencies.yaml (upstream)
-%define build_requires %build_requires_additional %opencv_require autoconf automake
gcc-c++ libtool make perl(ExtUtils::Embed) perl(Module::CPANfile) pkg-config
pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc)
+%define build_requires %opencv_require autoconf automake gcc-c++ libtool make
perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) >= 7.12 perl(Module::CPANfile)
perl(Pod::Html) pkg-config pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile)
pkgconfig(theoraenc)
# this is stuff we added to requires, we put it in its own macro
# to make resyncing with upstream spec changes easier. SUSE has
# perl-base, we have perl(base)
%define main_requires_additional perl(base)
# diff from SUSE: added main_requires_additional, dropped perl-base
# which does not exist in Fedora - we have perl(base) in
-# main_requires_additional and the perl(:MODULE_COMPAT) require below,
-# dropped perl(ExtUtils::MakeMaker) which should be in build_requires
+# main_requires_additional and the perl(:MODULE_COMPAT) require below
# The following line is generated from dependencies.yaml (upstream)
-%define main_requires %main_requires_additional perl(B::Deparse) perl(Carp)
perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS)
perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader)
perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib)
perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec)
perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar)
perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX)
perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils)
perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23 perl(Mojo::JSON)
perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42
perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2)
perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor)
perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML)
perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict)
perl(warnings)
-%define requires_not_needed_in_tests git-core
-# this is stuff we added to test_requires, we put it in its own macro
-# to make resyncing with upstream spec changes easier. Since 7add21687
-# it seems tests fail unless git is installed:
-#
https://github.com/os-autoinst/os-autoinst/pull/1436
-%define test_requires_additional git-core
+%define main_requires %main_requires_additional git-core perl(B::Deparse) perl(Carp)
perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS)
perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader)
perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib)
perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec)
perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar)
perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX)
perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils)
perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23 perl(Mojo::JSON)
perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42
perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2)
perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor)
perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML)
perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict)
perl(warnings)
# all requirements needed by the tests, do not require on this in the package
# itself or any sub-packages
-# diff from SUSE: added test_requires_additional, replaced qemu-tools
-# with qemu-img, replaced qemu-x86 with qemu-system-i386, dropped spell
-# check requirement stuff as this isn't needed in package builds IMO,
-# dropped critic stuff as we don't run those tests in our build
-# The following line is generated from dependencies.yaml
-%define test_requires %test_requires_additional %build_requires %main_requires
perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Exception)
perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject)
perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict)
perl(Test::Warnings) >= 0.029 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img
/usr/bin/qemu-system-i386
-# The following line is generated from dependencies.yaml
-%define devel_requires %requires_not_needed_in_tests %test_requires perl(Devel::Cover)
perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy)
+# diff from SUSE: replaced qemu-tools with qemu-img, replaced qemu-x86
+# with qemu-system-i386, dropped spellcheck requirement stuff as this
+# isn't needed in package builds IMO, dropped critic stuff as we don't
+# run those tests in our build
+# The following line is generated from dependencies.yaml (upstream)
+%define test_requires %build_requires %main_requires perl(Benchmark) perl(Devel::Cover)
perl(FindBin) perl(Pod::Coverage) perl(Test::Exception) perl(Test::Fatal)
perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mojo)
perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict)
perl(Test::Warnings) >= 0.029 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img
/usr/bin/qemu-system-i386
+# The following line is generated from dependencies.yaml (upstream)
+%define devel_requires %test_requires perl(Devel::Cover)
perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy)
BuildRequires: perl-devel
BuildRequires: perl-generators
@@ -102,7 +84,7 @@ Recommends: qemu >= 2.0.0
Recommends: qemu-kvm
Recommends: /usr/bin/qemu-img
BuildRequires: %test_requires
-Requires: %main_requires %requires_not_needed_in_tests
+Requires: %main_requires
Requires(pre): %{_bindir}/getent
Requires(pre): %{_sbindir}/useradd
@@ -172,8 +154,7 @@ make INSTALLDIRS=vendor %{?_smp_mflags}
%install
%make_install INSTALLDIRS=vendor
# only internal stuff
-rm
%{buildroot}%{_libexecdir}/os-autoinst/tools/{tidy,check_coverage,absolutize,docker_run_ci,update-deps}
-rm -r %{buildroot}%{_libexecdir}/os-autoinst/tools/lib/perlcritic
+rm -r %{buildroot}%{_libexecdir}/os-autoinst/tools/
# we don't really need to ship this in the package, usually the web UI
# is much better for needle editing
rm %{buildroot}%{_libexecdir}/os-autoinst/crop.py*
@@ -189,12 +170,15 @@ find %{buildroot} -depth -type d -and -not -name distri -exec rmdir
{} \;
export NO_BRP_STALE_LINK_ERROR=yes
%check
-# disable code quality checks - not worth the time for package builds
-sed '/perlcritic/d' -i Makefile
+# we may not pull Perl::Critic in for RPM builds as we don't run code
+# quality checks, so cut it from cpanfile ahead of the next check
sed '/Perl::Critic/d' -i cpanfile
-sed '/tidy/d' -i Makefile
+# should work offline
+for p in $(cpanfile-dump); do rpm -q --whatprovides "perl($p)"; done
+# 00-compile-check-all.t fails if this is present and Perl::Critic is
+# not installed
rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm
-make check test VERBOSE=1 CHECK_DOC=0
+make test VERBOSE=1
%post openvswitch
%systemd_post os-autoinst-openvswitch.service
@@ -230,8 +214,6 @@ make check test VERBOSE=1 CHECK_DOC=0
%{_libexecdir}/os-autoinst/backend
%{_libexecdir}/os-autoinst/OpenQA
%{_libexecdir}/os-autoinst/consoles
-%dir %{_libexecdir}/os-autoinst/tools
-%{_libexecdir}/os-autoinst/tools/preparepool
%{_libexecdir}/os-autoinst/autotest.pm
%{_bindir}/isotovideo
%{_bindir}/debugviewer
@@ -245,6 +227,9 @@ make check test VERBOSE=1 CHECK_DOC=0
%files devel
%changelog
+* Wed Jun 10 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-16.20200610gitf38e8b17
+- Bump to latest git, resync spec again
+
* Mon Jun 08 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-15.20200608gitbcbc6c41
- Bump to latest git, resync spec with upstream
diff --git a/sources b/sources
index 057c478..4a5d9d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz) =
df061b71621139737a7dae934810cb44354cb2c635e8ef61c0cef1f02e8dfb0b4419f2c2018f4e60d596622ada1d5c63f3a54cf7e65f7be89954f50125cf8a42
+SHA512 (os-autoinst-f38e8b174dc1a0cace4d624a197a297f9efdc2bb.tar.gz) =
5b6f1f7677b136f8fce66af92d468eb334cfb7d24cdb2622b3fbecc7aae8b069ecb969e5e35c22173f19470bf79d97503a8b82e372518ad0a6031e5f6d70779b
commit 011ae283a1a43037091d6c0174fe26c2d0e90cb9
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Mon Jun 8 17:15:52 2020 -0700
Bump to latest git, resync spec with upstream
diff --git a/.gitignore b/.gitignore
index 387d823..450b363 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,4 @@
/os-autoinst-63af2f4f91cfad88712bd0773e0a236d6e3853ea.tar.gz
/os-autoinst-50464d4e81fcac9dd36785ba88f69b489e4e99e7.tar.gz
/os-autoinst-85fa4f12c1fb5bed7295791801085d32a69d4586.tar.gz
+/os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz
diff --git a/0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
b/0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
deleted file mode 100644
index 158d8ff..0000000
--- a/0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 5a2c3ffa7264319c52f0dfd30bcff5f0a86ec01d Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam(a)redhat.com>
-Date: Mon, 25 May 2020 12:08:23 -0700
-Subject: [PATCH] Makefiles: set CXXFLAGS not CFLAGS or CPPFLAGS
-
-CFLAGS is for C compilation. CPPFLAGS is for the preprocessor.
-CXXFLAGS is for C++ compilation, which is what we're actually
-trying to apply the flags to in all three cases. CPPFLAGS happen
-to be applied to the compile stage as well as the preprocessor
-usually, so CPPFLAGS was working, but it wasn't correct. CFLAGS
-is not applied to C++ compiles, so `videoencoder_CFLAGS` was
-not being used at all.
-
-This broke build on Fedora Rawhide, because /usr/include/opencv2
-no longer exists there. There is /usr/include/opencv4/opencv2 and
-this should be fine because we should get -I/usr/include/opencv4
-from OPENCV_CFLAGS, but because of this bug, that wasn't set
-correctly and the build failed. With this change it works.
-
-Thanks to Orion Poplowski for reminding me of the CPPFLAGS vs.
-CXXFLAGS distinction here.
-
-Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
----
- Makefile.am | 2 +-
- debugviewer/Makefile.am | 2 +-
- snd2png/Makefile.am | 3 +--
- 3 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 61dbe1d2..a5b4fbf2 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -119,7 +119,7 @@ pkglibexec_FOLDERS = \
- pkglibexec_PROGRAMS = videoencoder
-
- videoencoder_SOURCES = videoencoder.cpp
--videoencoder_CFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
-+videoencoder_CXXFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
- videoencoder_LDADD = $(OPENCV_LIBS) $(THEORAENC_LIBS) -lm
-
- EXTRA_DIST = \
-diff --git a/debugviewer/Makefile.am b/debugviewer/Makefile.am
-index 47d1d953..eea1de60 100644
---- a/debugviewer/Makefile.am
-+++ b/debugviewer/Makefile.am
-@@ -2,6 +2,6 @@ bin_PROGRAMS = debugviewer
-
- debugviewer_SOURCES = debugviewer.cpp
-
--AM_CPPFLAGS = $(OPENCV_CFLAGS)
-+AM_CXXFLAGS = $(OPENCV_CFLAGS)
- debugviewer_LDFLAGS = $(OPENCV_LIBS)
-
-diff --git a/snd2png/Makefile.am b/snd2png/Makefile.am
-index 07bd084e..ec6f1840 100644
---- a/snd2png/Makefile.am
-+++ b/snd2png/Makefile.am
-@@ -2,8 +2,7 @@ bin_PROGRAMS = snd2png
-
- snd2png_SOURCES = snd2png.cpp
-
--AM_CXXFLAGS = -g3 -Wall -W
--AM_CPPFLAGS = $(OPENCV_CFLAGS) $(FFTW_CFLAGS) $(SNDFILE_CFLAGS)
-+AM_CXXFLAGS = -g3 -Wall -W $(OPENCV_CFLAGS) $(FFTW_CFLAGS) $(SNDFILE_CFLAGS)
- snd2png_LDFLAGS = $(OPENCV_LIBS) $(FFTW_LIBS) $(SNDFILE_LIBS) -lm
-
- check-local:
---
-2.26.2
-
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 796f724..3927ad9 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -31,58 +31,62 @@
%global github_owner os-autoinst
%global github_name os-autoinst
%global github_version 4.6
-%global github_commit 85fa4f12c1fb5bed7295791801085d32a69d4586
+%global github_commit bcbc6c412cbd69ab461d5448f8bf08b5371a0adb
# if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date 20200430
+%global github_date 20200608
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
Name: os-autoinst
Version: %{github_version}
-Release: 14%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 15%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL:
https://os-autoinst.github.io/openQA/
Source0:
https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit...
-#
https://github.com/os-autoinst/os-autoinst/pull/1419
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1839616
-# Fixes build when /usr/include/opencv2 compat symlink is removed
-Patch0: 0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
# on SUSE this is conditional, for us it doesn't have to be but we
# still use a macro just to keep build_requires similar for ease of
# cross-comparison
%define opencv_require pkgconfig(opencv)
# this is stuff we added to build_requires, we put it in its own macro
-# to make resyncing with upstream spec changes easier. TODO: submit
-# these upstream, at least ones that make sense for SUSE too.
-%define build_requires_additional perl(ExtUtils::MakeMaker) perl(ExtUtils::Embed)
+# to make resyncing with upstream spec changes easier. Upstream put
+# MakeMaker in main_requires for some reason but it is clearly a build
+# requirement:
+#
https://github.com/os-autoinst/os-autoinst/pull/1435
+# Pod::Html is needed to run pod2html as part of doc build, it used to
+# be pulled in as a dep of Perl::Tidy but that's not explicitly listed
+# in test_requires any more:
+#
https://github.com/os-autoinst/os-autoinst/pull/1437
+%define build_requires_additional perl(ExtUtils::MakeMaker) >= 7.12 perl(Pod::Html)
# diff from SUSE: added build_requires_additional
-%define build_requires %build_requires_additional %opencv_require autoconf automake
gcc-c++ libtool make perl(Module::CPANfile) pkg-config pkgconfig(fftw3) pkgconfig(libpng)
pkgconfig(sndfile) pkgconfig(theoraenc)
+# The following line is generated from dependencies.yaml (upstream)
+%define build_requires %build_requires_additional %opencv_require autoconf automake
gcc-c++ libtool make perl(ExtUtils::Embed) perl(Module::CPANfile) pkg-config
pkgconfig(fftw3) pkgconfig(libpng) pkgconfig(sndfile) pkgconfig(theoraenc)
# this is stuff we added to requires, we put it in its own macro
-# to make resyncing with upstream spec changes easier. These are all
-# things ppisar added in afeb766c. TODO: submit these upstream, at
-# least ones that make sense for SUSE too.
-%define requires_additional perl(base) perl(Carp) perl(Cwd) perl(English) perl(Errno)
perl(Fcntl) perl(File::Temp) perl(integer) perl(Mojo::JSON) perl(Mojo::Log) perl(POSIX)
perl(Scalar::Util) perl(Socket) perl(strict) perl(Time::HiRes) perl(warnings)
-# diff from SUSE: added requires_additional, dropped perl-base which
-# does not exist in Fedora - we have perl(base) in requires_additional
-# and the perl(:MODULE_COMPAT) require below
-%define requires %requires_additional perl(B::Deparse) perl(Carp::Always)
perl(Class::Accessor::Fast) perl(Cpanel::JSON::XS) perl(Crypt::DES) perl(Data::Dumper)
perl(Exception::Class) perl(File::Touch) perl(File::Which) perl(IO::Scalar)
perl(IO::Socket::INET) perl(IPC::Run::Debug) perl(IPC::System::Simple)
perl(List::MoreUtils) perl(Mojolicious) >= 7.92 perl(Mojo::IOLoop::ReadWriteProcess)
>= 0.23 perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2)
perl(Socket::MsgHdr) perl(Try::Tiny) perl(XML::LibXML) perl(XML::SemanticDiff)
perl(autodie)
+# to make resyncing with upstream spec changes easier. SUSE has
+# perl-base, we have perl(base)
+%define main_requires_additional perl(base)
+# diff from SUSE: added main_requires_additional, dropped perl-base
+# which does not exist in Fedora - we have perl(base) in
+# main_requires_additional and the perl(:MODULE_COMPAT) require below,
+# dropped perl(ExtUtils::MakeMaker) which should be in build_requires
+# The following line is generated from dependencies.yaml (upstream)
+%define main_requires %main_requires_additional perl(B::Deparse) perl(Carp)
perl(Carp::Always) perl(Class::Accessor::Fast) perl(Config) perl(Cpanel::JSON::XS)
perl(Crypt::DES) perl(Cwd) perl(Data::Dumper) perl(Digest::MD5) perl(DynaLoader)
perl(English) perl(Errno) perl(Exception::Class) perl(Exporter) perl(ExtUtils::testlib)
perl(Fcntl) perl(File::Basename) perl(File::Find) perl(File::Path) perl(File::Spec)
perl(File::Temp) perl(File::Touch) perl(File::Which) perl(IO::Handle) perl(IO::Scalar)
perl(IO::Select) perl(IO::Socket) perl(IO::Socket::INET) perl(IO::Socket::UNIX)
perl(IPC::Open3) perl(IPC::Run::Debug) perl(IPC::System::Simple) perl(List::MoreUtils)
perl(List::Util) perl(Mojo::IOLoop::ReadWriteProcess) >= 0.23 perl(Mojo::JSON)
perl(Mojo::Log) perl(Mojo::URL) perl(Mojo::UserAgent) perl(Mojolicious) >= 8.42
perl(Mojolicious::Lite) perl(Net::DBus) perl(Net::IP) perl(Net::SNMP) perl(Net::SSH2)
perl(POSIX) perl(Scalar::Util) perl(Socket) perl(Socket::MsgHdr) perl(Term::ANSIColor)
perl(Thread::Queue) perl(Time::HiRes) perl(Try::Tiny) perl(XML::LibXML)
perl(XML::SemanticDiff) perl(autodie) perl(base) perl(constant) perl(integer) perl(strict)
perl(warnings)
%define requires_not_needed_in_tests git-core
# this is stuff we added to test_requires, we put it in its own macro
-# to make resyncing with upstream spec changes easier. FindBin is one
-# ppisar added in afeb766c, Test::Mojo and Test::More are just things
-# the test suite uses which I added, we add qemu-system-i386 because
-# the fullstack and qemu-options tests use it - we run them in Koji
-# but SUSE disables them as they cannot run in OBS, so they don't have
-# the requirement either. TODO: submit relevant changes upstream
-%define test_requires_additional perl(FindBin) perl(Test::Mojo) perl(Test::More)
/usr/bin/qemu-system-i386
+# to make resyncing with upstream spec changes easier. Since 7add21687
+# it seems tests fail unless git is installed:
+#
https://github.com/os-autoinst/os-autoinst/pull/1436
+%define test_requires_additional git-core
# all requirements needed by the tests, do not require on this in the package
# itself or any sub-packages
# diff from SUSE: added test_requires_additional, replaced qemu-tools
-# with qemu-img, dropped spell check requirement stuff as this isn't
-# needed in package builds IMO
-%define test_requires %test_requires_additional %build_requires %requires
perl(Devel::Cover) perl(Perl::Tidy) perl(Pod::Coverage) perl(Test::Exception)
perl(Test::Fatal) perl(Test::MockModule) perl(Test::MockObject) perl(Test::Mock::Time)
perl(Test::Output) perl(Test::Pod) perl(Test::Strict) perl(Test::Warnings)
/usr/bin/qemu-img
-%define devel_requires %test_requires %requires_not_needed_in_tests
+# with qemu-img, replaced qemu-x86 with qemu-system-i386, dropped spell
+# check requirement stuff as this isn't needed in package builds IMO,
+# dropped critic stuff as we don't run those tests in our build
+# The following line is generated from dependencies.yaml
+%define test_requires %test_requires_additional %build_requires %main_requires
perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Pod::Coverage) perl(Test::Exception)
perl(Test::Fatal) perl(Test::Mock::Time) perl(Test::MockModule) perl(Test::MockObject)
perl(Test::Mojo) perl(Test::More) perl(Test::Output) perl(Test::Pod) perl(Test::Strict)
perl(Test::Warnings) >= 0.029 perl(YAML::PP) qemu-kvm /usr/bin/qemu-img
/usr/bin/qemu-system-i386
+# The following line is generated from dependencies.yaml
+%define devel_requires %requires_not_needed_in_tests %test_requires perl(Devel::Cover)
perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy)
BuildRequires: perl-devel
BuildRequires: perl-generators
@@ -98,7 +102,7 @@ Recommends: qemu >= 2.0.0
Recommends: qemu-kvm
Recommends: /usr/bin/qemu-img
BuildRequires: %test_requires
-Requires: %requires %requires_not_needed_in_tests
+Requires: %main_requires %requires_not_needed_in_tests
Requires(pre): %{_bindir}/getent
Requires(pre): %{_sbindir}/useradd
@@ -168,7 +172,7 @@ make INSTALLDIRS=vendor %{?_smp_mflags}
%install
%make_install INSTALLDIRS=vendor
# only internal stuff
-rm %{buildroot}%{_libexecdir}/os-autoinst/tools/{tidy,check_coverage,absolutize}
+rm
%{buildroot}%{_libexecdir}/os-autoinst/tools/{tidy,check_coverage,absolutize,docker_run_ci,update-deps}
rm -r %{buildroot}%{_libexecdir}/os-autoinst/tools/lib/perlcritic
# we don't really need to ship this in the package, usually the web UI
# is much better for needle editing
@@ -241,6 +245,9 @@ make check test VERBOSE=1 CHECK_DOC=0
%files devel
%changelog
+* Mon Jun 08 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-15.20200608gitbcbc6c41
+- Bump to latest git, resync spec with upstream
+
* Thu Jun 04 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 4.6-14.20200430git85fa4f1
- Rebuilt for OpenCV 4.3
diff --git a/sources b/sources
index 3ad082c..057c478 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (os-autoinst-85fa4f12c1fb5bed7295791801085d32a69d4586.tar.gz) =
d7c6cb7f6f7c3cf923e76a1f9e887abf451a68412bda2dfef05d510cc625ea758669510dd33ab736b30674ca6fb34f9f95be69e0334c3b683627e95ee67d39d9
+SHA512 (os-autoinst-bcbc6c412cbd69ab461d5448f8bf08b5371a0adb.tar.gz) =
df061b71621139737a7dae934810cb44354cb2c635e8ef61c0cef1f02e8dfb0b4419f2c2018f4e60d596622ada1d5c63f3a54cf7e65f7be89954f50125cf8a42
commit 1fb091908c5635b0077e35eaa22dd370e8eaf231
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jun 5 11:26:35 2020 +0200
Also disable for s390x
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 2af7fba..796f724 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -10,7 +10,7 @@
# works on F31, works in a mock root...really not worth debugging more
# 14-isotovideo.t also broken since ~2020/04, os-autoinst apparently
# does not run in first subtest, can't figure out why not
-%ifarch %{arm}
+%ifarch %{arm} s390x
%global no_options 1
%global no_isotovideo 1
%endif
commit 272609be0eb3477197b3763f1c554cf43d95686c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Jun 4 17:49:05 2020 +0200
Rebuilt
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 6c30346..2af7fba 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -38,7 +38,7 @@
Name: os-autoinst
Version: %{github_version}
-Release: 13%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 14%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL:
https://os-autoinst.github.io/openQA/
@@ -241,6 +241,9 @@ make check test VERBOSE=1 CHECK_DOC=0
%files devel
%changelog
+* Thu Jun 04 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 4.6-14.20200430git85fa4f1
+- Rebuilt for OpenCV 4.3
+
* Mon May 25 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-13.20200430git85fa4f12
- Backport PR #1419 to fix build on Rawhide (opencv4)
commit 981522c8e524ec193e52848f26916a1b510d31ee
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Mon May 25 15:10:04 2020 -0700
Update PR #1419 patch (no need for a rebuild though)
diff --git a/0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
b/0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
deleted file mode 100644
index 6300c02..0000000
--- a/0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 0626b1a9085f80b4a162964376d1fdadf3e3dcdf Mon Sep 17 00:00:00 2001
-From: Adam Williamson <awilliam(a)redhat.com>
-Date: Mon, 25 May 2020 12:08:23 -0700
-Subject: [PATCH] Makefile.am: set videoencoder_CPPFLAGS not
- videoencoder_CFLAGS
-
-videoencoder is built as C++, not C, we should be setting
-CPPFLAGS here, not CFLAGS. This is what we do for debugviewer and
-snd2png.
-
-This broke build on Fedora Rawhide, because /usr/include/opencv2
-no longer exists there. There is /usr/include/opencv4/opencv2 and
-this should be fine because we should get -I/usr/include/opencv4
-from OPENCV_CFLAGS, but because of this bug, that wasn't set
-correctly and the build failed. With this change it works.
-
-Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 61dbe1d2..57911b05 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -119,7 +119,7 @@ pkglibexec_FOLDERS = \
- pkglibexec_PROGRAMS = videoencoder
-
- videoencoder_SOURCES = videoencoder.cpp
--videoencoder_CFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
-+videoencoder_CPPFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
- videoencoder_LDADD = $(OPENCV_LIBS) $(THEORAENC_LIBS) -lm
-
- EXTRA_DIST = \
---
-2.26.2
-
diff --git a/0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
b/0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
new file mode 100644
index 0000000..158d8ff
--- /dev/null
+++ b/0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
@@ -0,0 +1,71 @@
+From 5a2c3ffa7264319c52f0dfd30bcff5f0a86ec01d Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam(a)redhat.com>
+Date: Mon, 25 May 2020 12:08:23 -0700
+Subject: [PATCH] Makefiles: set CXXFLAGS not CFLAGS or CPPFLAGS
+
+CFLAGS is for C compilation. CPPFLAGS is for the preprocessor.
+CXXFLAGS is for C++ compilation, which is what we're actually
+trying to apply the flags to in all three cases. CPPFLAGS happen
+to be applied to the compile stage as well as the preprocessor
+usually, so CPPFLAGS was working, but it wasn't correct. CFLAGS
+is not applied to C++ compiles, so `videoencoder_CFLAGS` was
+not being used at all.
+
+This broke build on Fedora Rawhide, because /usr/include/opencv2
+no longer exists there. There is /usr/include/opencv4/opencv2 and
+this should be fine because we should get -I/usr/include/opencv4
+from OPENCV_CFLAGS, but because of this bug, that wasn't set
+correctly and the build failed. With this change it works.
+
+Thanks to Orion Poplowski for reminding me of the CPPFLAGS vs.
+CXXFLAGS distinction here.
+
+Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
+---
+ Makefile.am | 2 +-
+ debugviewer/Makefile.am | 2 +-
+ snd2png/Makefile.am | 3 +--
+ 3 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 61dbe1d2..a5b4fbf2 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -119,7 +119,7 @@ pkglibexec_FOLDERS = \
+ pkglibexec_PROGRAMS = videoencoder
+
+ videoencoder_SOURCES = videoencoder.cpp
+-videoencoder_CFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
++videoencoder_CXXFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
+ videoencoder_LDADD = $(OPENCV_LIBS) $(THEORAENC_LIBS) -lm
+
+ EXTRA_DIST = \
+diff --git a/debugviewer/Makefile.am b/debugviewer/Makefile.am
+index 47d1d953..eea1de60 100644
+--- a/debugviewer/Makefile.am
++++ b/debugviewer/Makefile.am
+@@ -2,6 +2,6 @@ bin_PROGRAMS = debugviewer
+
+ debugviewer_SOURCES = debugviewer.cpp
+
+-AM_CPPFLAGS = $(OPENCV_CFLAGS)
++AM_CXXFLAGS = $(OPENCV_CFLAGS)
+ debugviewer_LDFLAGS = $(OPENCV_LIBS)
+
+diff --git a/snd2png/Makefile.am b/snd2png/Makefile.am
+index 07bd084e..ec6f1840 100644
+--- a/snd2png/Makefile.am
++++ b/snd2png/Makefile.am
+@@ -2,8 +2,7 @@ bin_PROGRAMS = snd2png
+
+ snd2png_SOURCES = snd2png.cpp
+
+-AM_CXXFLAGS = -g3 -Wall -W
+-AM_CPPFLAGS = $(OPENCV_CFLAGS) $(FFTW_CFLAGS) $(SNDFILE_CFLAGS)
++AM_CXXFLAGS = -g3 -Wall -W $(OPENCV_CFLAGS) $(FFTW_CFLAGS) $(SNDFILE_CFLAGS)
+ snd2png_LDFLAGS = $(OPENCV_LIBS) $(FFTW_LIBS) $(SNDFILE_LIBS) -lm
+
+ check-local:
+--
+2.26.2
+
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 7743653..6c30346 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -46,7 +46,7 @@ Source0:
https://github.com/%{github_owner}/%{github_name}/archive/%{gith
#
https://github.com/os-autoinst/os-autoinst/pull/1419
#
https://bugzilla.redhat.com/show_bug.cgi?id=1839616
# Fixes build when /usr/include/opencv2 compat symlink is removed
-Patch0: 0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
+Patch0: 0001-Makefiles-set-CXXFLAGS-not-CFLAGS-or-CPPFLAGS.patch
# on SUSE this is conditional, for us it doesn't have to be but we
# still use a macro just to keep build_requires similar for ease of
commit 8d39d82a19a76155d5a02e5a5077d81a0b400f58
Author: Adam Williamson <awilliam(a)redhat.com>
Date: Mon May 25 13:30:18 2020 -0700
Backport PR #1419 to fix Rawhide build, drop a test on 32-bit ARM
diff --git a/0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
b/0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
new file mode 100644
index 0000000..6300c02
--- /dev/null
+++ b/0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
@@ -0,0 +1,37 @@
+From 0626b1a9085f80b4a162964376d1fdadf3e3dcdf Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam(a)redhat.com>
+Date: Mon, 25 May 2020 12:08:23 -0700
+Subject: [PATCH] Makefile.am: set videoencoder_CPPFLAGS not
+ videoencoder_CFLAGS
+
+videoencoder is built as C++, not C, we should be setting
+CPPFLAGS here, not CFLAGS. This is what we do for debugviewer and
+snd2png.
+
+This broke build on Fedora Rawhide, because /usr/include/opencv2
+no longer exists there. There is /usr/include/opencv4/opencv2 and
+this should be fine because we should get -I/usr/include/opencv4
+from OPENCV_CFLAGS, but because of this bug, that wasn't set
+correctly and the build failed. With this change it works.
+
+Signed-off-by: Adam Williamson <awilliam(a)redhat.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 61dbe1d2..57911b05 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -119,7 +119,7 @@ pkglibexec_FOLDERS = \
+ pkglibexec_PROGRAMS = videoencoder
+
+ videoencoder_SOURCES = videoencoder.cpp
+-videoencoder_CFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
++videoencoder_CPPFLAGS = -O2 -Wall -W $(OPENCV_CFLAGS)
+ videoencoder_LDADD = $(OPENCV_LIBS) $(THEORAENC_LIBS) -lm
+
+ EXTRA_DIST = \
+--
+2.26.2
+
diff --git a/os-autoinst.spec b/os-autoinst.spec
index 849f30a..7743653 100644
--- a/os-autoinst.spec
+++ b/os-autoinst.spec
@@ -8,8 +8,11 @@
%endif
# 18-qemu-options.t broken on 32-bit ARM on F30 2019/08
# works on F31, works in a mock root...really not worth debugging more
+# 14-isotovideo.t also broken since ~2020/04, os-autoinst apparently
+# does not run in first subtest, can't figure out why not
%ifarch %{arm}
%global no_options 1
+%global no_isotovideo 1
%endif
# os-autoinst has a bunch of annoyingly-badly-named private modules,
@@ -35,11 +38,16 @@
Name: os-autoinst
Version: %{github_version}
-Release: 12%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
+Release: 13%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
Summary: OS-level test automation
License: GPLv2+
URL:
https://os-autoinst.github.io/openQA/
Source0:
https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit...
+#
https://github.com/os-autoinst/os-autoinst/pull/1419
+#
https://bugzilla.redhat.com/show_bug.cgi?id=1839616
+# Fixes build when /usr/include/opencv2 compat symlink is removed
+Patch0: 0001-Makefile.am-set-videoencoder_CPPFLAGS-not-videoencod.patch
+
# on SUSE this is conditional, for us it doesn't have to be but we
# still use a macro just to keep build_requires similar for ease of
# cross-comparison
@@ -125,21 +133,28 @@ This package contains Open vSwitch support for os-autoinst.
%autosetup -n %{github_name}-%{github_commit} -p1
# Replace version number from git to what's reported by the package
sed -i 's/ my $thisversion = qx{git.*rev-parse HEAD}.*;/ my $thisversion =
"%{version}";/' isotovideo
+
%if 0%{?no_fullstack}
rm -f t/99-full-stack.t
sed -i -e '/99-full-stack.t/d' Makefile.am
%endif # no_fullstack
+
%if 0%{?no_options}
rm -f t/18-qemu-options.t
sed -i -e '/18-qemu-options.t/d' Makefile.am
%endif
+
+%if 0%{?no_isotovideo}
+rm -f t/14-isotovideo.t
+sed -i -e '/14-isotovideo.t/d' Makefile.am
+%endif
+
# 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 '/02-test_ocr.t/d' Makefile.am
-%endif # fedora > 29
+
#
https://progress.opensuse.org/issues/60755
rm -f t/07-commands.t
sed -i -e '/07-commands.t/d' Makefile.am
@@ -226,6 +241,9 @@ make check test VERBOSE=1 CHECK_DOC=0
%files devel
%changelog
+* Mon May 25 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-13.20200430git85fa4f12
+- Backport PR #1419 to fix build on Rawhide (opencv4)
+
* Thu Apr 30 2020 Adam Williamson <awilliam(a)redhat.com> -
4.6-12.20200430git85fa4f12
- Bump to latest git
- Resync spec with upstream, tweak dependency macro implementation