diff --git a/.gitignore b/.gitignore index ab5502f..a4f7d9d 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /os-autoinst-c597122986fb779fe5985a96c2d73aa03e2d4b15.tar.gz /os-autoinst-3391d604ae36c0db0cda1d38f170137aef486a0c.tar.gz /os-autoinst-447dab862096c5fb871fe06f61c3e5249ec0d5c1.tar.gz +/os-autoinst-75fbe1d37699c43909b6c1cb698decdebf4849d7.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index bba5d4c..9f99221 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -28,14 +28,14 @@ %global github_owner os-autoinst %global github_name os-autoinst %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 -%global github_date 20191029 +%global github_date 20191121 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst 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 License: GPLv2+ 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 %if 0%{?no_fullstack} 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 %if 0%{?no_options} 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 # 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 +sed -i -e '/02-test_ocr.t/d' t/Makefile.am %endif # fedora > 29 %build @@ -203,6 +203,9 @@ make check VERBOSE=1 %files devel %changelog +* Thu Nov 21 2019 Adam Williamson - 4.6-3.20191121git75fbe1d3 +- Update to latest git again + * Thu Oct 31 2019 Adam Williamson - 4.6-2.20191029git447dab86 - Properly generate -devel package diff --git a/sources b/sources index 83fabfa..28cb2a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (os-autoinst-447dab862096c5fb871fe06f61c3e5249ec0d5c1.tar.gz) = d4031440eaa56aa3b820b75e22228c5ddf332f4be290f5cbc3f02ea4396ad7666f07f9c3342e4d662331a847979eb2f4d00ea024ea919b8ee23f66a7973322a1 +SHA512 (os-autoinst-75fbe1d37699c43909b6c1cb698decdebf4849d7.tar.gz) = f07bea739b9c4cbabe17b9fb4aa17b1adbd51a7f5b398675e560172e3996a41c3bca17b73dce1a0e8819b8ee0ed249086774bbc4bee6977e18ac63beb8310908