|
|
|
@ -28,14 +28,14 @@
|
|
|
|
%global github_owner os-autoinst
|
|
|
|
%global github_owner os-autoinst
|
|
|
|
%global github_name os-autoinst
|
|
|
|
%global github_name os-autoinst
|
|
|
|
%global github_version 4.6
|
|
|
|
%global github_version 4.6
|
|
|
|
%global github_commit 447dab862096c5fb871fe06f61c3e5249ec0d5c1
|
|
|
|
%global github_commit 75fbe1d37699c43909b6c1cb698decdebf4849d7
|
|
|
|
# if set, will be a post-release snapshot build, otherwise a 'normal' build
|
|
|
|
# if set, will be a post-release snapshot build, otherwise a 'normal' build
|
|
|
|
%global github_date 20191029
|
|
|
|
%global github_date 20191121
|
|
|
|
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
|
|
|
|
%global shortcommit %(c=%{github_commit}; echo ${c:0:7})
|
|
|
|
|
|
|
|
|
|
|
|
Name: os-autoinst
|
|
|
|
Name: os-autoinst
|
|
|
|
Version: %{github_version}
|
|
|
|
Version: %{github_version}
|
|
|
|
Release: 2%{?github_date:.%{github_date}git%{shortcommit}}%{?dist}
|
|
|
|
Release: 3%{?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/
|
|
|
|
@ -107,18 +107,18 @@ This package contains Open vSwitch support for os-autoinst.
|
|
|
|
sed -i 's/ my $thisversion = qx{git.*rev-parse HEAD}.*;/ my $thisversion = "%{version}";/' isotovideo
|
|
|
|
sed -i 's/ my $thisversion = qx{git.*rev-parse HEAD}.*;/ my $thisversion = "%{version}";/' isotovideo
|
|
|
|
%if 0%{?no_fullstack}
|
|
|
|
%if 0%{?no_fullstack}
|
|
|
|
rm -f t/99-full-stack.t
|
|
|
|
rm -f t/99-full-stack.t
|
|
|
|
sed -i -e 's, 99-full-stack.t,,g' t/Makefile.am
|
|
|
|
sed -i -e '/99-full-stack.t/d' t/Makefile.am
|
|
|
|
%endif # no_fullstack
|
|
|
|
%endif # no_fullstack
|
|
|
|
%if 0%{?no_options}
|
|
|
|
%if 0%{?no_options}
|
|
|
|
rm -f t/18-qemu-options.t
|
|
|
|
rm -f t/18-qemu-options.t
|
|
|
|
sed -i -e 's, 18-qemu-options.t,,g' t/Makefile.am
|
|
|
|
sed -i -e '/18-qemu-options.t/d' t/Makefile.am
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
# Tesseract 4.0.0 (in Rawhide as of 2018-11) fails utterly to OCR
|
|
|
|
# Tesseract 4.0.0 (in Rawhide as of 2018-11) fails utterly to OCR
|
|
|
|
# the test needle properly:
|
|
|
|
# the test needle properly:
|
|
|
|
# https://github.com/tesseract-ocr/tesseract/issues/2052
|
|
|
|
# https://github.com/tesseract-ocr/tesseract/issues/2052
|
|
|
|
%if 0%{?fedora} > 29
|
|
|
|
%if 0%{?fedora} > 29
|
|
|
|
rm -f t/02-test_ocr.t
|
|
|
|
rm -f t/02-test_ocr.t
|
|
|
|
sed -i -e 's, 02-test_ocr.t,,g' t/Makefile.am
|
|
|
|
sed -i -e '/02-test_ocr.t/d' t/Makefile.am
|
|
|
|
%endif # fedora > 29
|
|
|
|
%endif # fedora > 29
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
%build
|
|
|
|
@ -203,6 +203,9 @@ make check VERBOSE=1
|
|
|
|
%files devel
|
|
|
|
%files devel
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
|
|
|
|
* Thu Nov 21 2019 Adam Williamson <awilliam@redhat.com> - 4.6-3.20191121git75fbe1d3
|
|
|
|
|
|
|
|
- Update to latest git again
|
|
|
|
|
|
|
|
|
|
|
|
* Thu Oct 31 2019 Adam Williamson <awilliam@redhat.com> - 4.6-2.20191029git447dab86
|
|
|
|
* Thu Oct 31 2019 Adam Williamson <awilliam@redhat.com> - 4.6-2.20191029git447dab86
|
|
|
|
- Properly generate -devel package
|
|
|
|
- Properly generate -devel package
|
|
|
|
|
|
|
|
|
|
|
|
|
Adam Williamson
5 years ago