diff --git a/os-autoinst-4.6.1591696864.96b3acb2.obscpio b/os-autoinst-4.6.1591696864.96b3acb2.obscpio deleted file mode 100644 index 704ded7..0000000 --- a/os-autoinst-4.6.1591696864.96b3acb2.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bebf12ef4d26b5c32a1dcfe212f0a3d48d07c83cee66717f02e97c8d2049ed41 -size 24977933 diff --git a/os-autoinst-4.6.1591792386.f38e8b17.obscpio b/os-autoinst-4.6.1591792386.f38e8b17.obscpio new file mode 100644 index 0000000..ecf45b5 --- /dev/null +++ b/os-autoinst-4.6.1591792386.f38e8b17.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b210a9215bbfa0148576d5a3e4cc953abd2017e1f7f5c9a6c2a818875235a73 +size 24976909 diff --git a/os-autoinst-test.spec b/os-autoinst-test.spec index 1275ccb..a316c37 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.1591696864.96b3acb2 +Version: 4.6.1591792386.f38e8b17 Release: 0 Summary: test package for os-autoinst #BuildRequires: %{short_name} == %{version} diff --git a/os-autoinst.changes b/os-autoinst.changes index 5f2eba6..145eaa1 100644 --- a/os-autoinst.changes +++ b/os-autoinst.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Jun 11 19:25:06 UTC 2020 - okurz@suse.com + +- Update to version 4.6.1591792386.f38e8b17: + * spec: Remove tools/ directory + * t: Skip 27-make-update-deps.t when there is no .git + * Move git to %main_requires as git-core + * Remove tools/preparepool + * Add Pod::Html to build_requires + ------------------------------------------------------------------- Tue Jun 09 10:01:14 UTC 2020 - okurz@suse.com diff --git a/os-autoinst.obsinfo b/os-autoinst.obsinfo index 64d161d..b799aab 100644 --- a/os-autoinst.obsinfo +++ b/os-autoinst.obsinfo @@ -1,5 +1,5 @@ name: os-autoinst -version: 4.6.1591696864.96b3acb2 -mtime: 1591696864 -commit: 96b3acb23769652893187a5232e510199ed624c2 +version: 4.6.1591792386.f38e8b17 +mtime: 1591792386 +commit: f38e8b174dc1a0cace4d624a197a297f9efdc2bb diff --git a/os-autoinst.spec b/os-autoinst.spec index b79a41c..5dbba64 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -17,7 +17,7 @@ Name: os-autoinst -Version: 4.6.1591696864.96b3acb2 +Version: 4.6.1591792386.f38e8b17 Release: 0 Summary: OS-level test automation License: GPL-2.0-or-later @@ -32,10 +32,9 @@ Source0: %{name}-%{version}.tar.xz %define opencv_require pkgconfig(opencv) %endif # The following line is generated from dependencies.yaml -%define build_requires %opencv_require autoconf automake gcc-c++ libtool make perl(ExtUtils::Embed) perl(ExtUtils::MakeMaker) >= 7.12 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) # The following line is generated from dependencies.yaml -%define main_requires 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) perl-base -%define requires_not_needed_in_tests git-core +%define main_requires 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) perl-base # all requirements needed by the tests, do not require on this in the package # itself or any sub-packages # SLE is missing spell check requirements @@ -55,10 +54,9 @@ Source0: %{name}-%{version}.tar.xz # The following line is generated from dependencies.yaml %define test_requires %build_requires %main_requires %spellcheck_requires perl(Benchmark) perl(Devel::Cover) perl(FindBin) perl(Perl::Critic) perl(Perl::Critic::Freenode) 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 qemu-tools qemu-x86 # 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) +%define devel_requires %test_requires perl(Devel::Cover) perl(Devel::Cover::Report::Codecov) perl(Perl::Tidy) BuildRequires: %test_requires Requires: %main_requires -Requires: %requires_not_needed_in_tests Recommends: tesseract-ocr Recommends: /usr/bin/xkbcomp /usr/bin/Xvnc dumponlyconsole Recommends: qemu >= 2.0.0 @@ -118,9 +116,8 @@ make INSTALLDIRS=vendor %{?_smp_mflags} %install %make_install INSTALLDIRS=vendor # only internal stuff -rm %{buildroot}/usr/lib/os-autoinst/tools/{tidy,check_coverage,absolutize,docker_run_ci,update-deps} -rm -r %{buildroot}/usr/lib/os-autoinst/tools/lib/perlcritic -# +rm -r %{buildroot}/usr/lib/os-autoinst/tools/ + ls -lR %buildroot find %{buildroot} -type f -name .packlist -print0 | xargs -0 --no-run-if-empty rm -f find %{buildroot} -depth -type d -and -not -name distri -print0 | xargs -0 --no-run-if-empty rmdir 2>/dev/null || true @@ -138,7 +135,6 @@ export NO_BRP_STALE_LINK_ERROR=yes sed '/perlcritic/d' -i Makefile sed '/Perl::Critic/d' -i cpanfile sed '/tidy/d' -i Makefile -rm tools/lib/perlcritic/Perl/Critic/Policy/*.pm # should work offline for p in $(cpanfile-dump); do rpm -q --whatprovides "perl($p)"; done @@ -179,8 +175,6 @@ make check test VERBOSE=1 %{make_check_args} %{_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 %{_libexecdir}/os-autoinst/crop.py