Rearrange the requires ppisar added into the macros

Signed-off-by: Adam Williamson <awilliam@redhat.com>
f38
Adam Williamson 5 years ago
parent c668cb5771
commit 0774974926

@ -35,7 +35,7 @@
Name: os-autoinst Name: os-autoinst
Version: %{github_version} 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 Summary: OS-level test automation
License: GPLv2+ License: GPLv2+
URL: https://os-autoinst.github.io/openQA/ 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 %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 # diff from SUSE: dropped perl-base which does not exist in Fedora, we have
# the perl(:MODULE_COMPAT) require below # 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 %define requires_not_needed_in_tests git-core
# all requirements needed by the tests, do not require on this in the package # all requirements needed by the tests, do not require on this in the package
# itself or any sub-packages # 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 # these disabled as qemu can't run in OBS apparently), dropped spell
# check requirement stuff as this isn't needed in package builds IMO # check requirement stuff as this isn't needed in package builds IMO
# perl(Test::Strict) added, upstream should have this too # 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 %define devel_requires %test_requires %requires_not_needed_in_tests
BuildRequires: perl-devel BuildRequires: perl-devel
BuildRequires: perl-generators BuildRequires: perl-generators
BuildRequires: systemd BuildRequires: systemd
BuildRequires: perl(FindBin)
%if 0%{?no_fullstack} %if 0%{?no_fullstack}
%else %else
BuildRequires: perl(Mojo::File) BuildRequires: perl(Mojo::File)
%endif # no_fullstack %endif # no_fullstack
BuildRequires: perl(Mojo::JSON)
BuildRequires: perl(Mojo::Log)
# tinycv is a compiled public module, so we should have this # tinycv is a compiled public module, so we should have this
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
Recommends: tesseract Recommends: tesseract
@ -211,6 +209,9 @@ make check test VERBOSE=1 CHECK_DOC=0
%files devel %files devel
%changelog %changelog
* Fri Apr 17 2020 Adam Williamson <awilliam@redhat.com> - 4.6-11.20200414git50464d4e
- Rearrange the dependencies ppisar added
* Wed Apr 15 2020 Adam Williamson <awilliam@redhat.com> - 4.6-10.20200414git50464d4e * Wed Apr 15 2020 Adam Williamson <awilliam@redhat.com> - 4.6-10.20200414git50464d4e
- Bump to latest git - Bump to latest git

Loading…
Cancel
Save