From 5d84c71f2e7d51f55505ee332e52c615143430c9 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 3 Sep 2016 10:48:01 -0700 Subject: [PATCH] bump to latest git, lots of fixes this has been running on staging for a while, via scratch builds. --- .gitignore | 1 + os-autoinst.spec | 32 ++++++++++++++++++++------------ sources | 2 +- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index aae56f7..e29f02f 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /os-autoinst-c5e11abc7876a60e48868b7663693f135dad194b.tar.gz /os-autoinst-243c03670ffca3d5c7f54235b3c948fb83976210.tar.gz /os-autoinst-f5bb0fe960e394f135f49fc7e4cfc0dc2d90ba53.tar.gz +/os-autoinst-0b5d885b30e84a229809d1e9e89b8b42533b8643.tar.gz diff --git a/os-autoinst.spec b/os-autoinst.spec index 53eb603..6a6b09c 100644 --- a/os-autoinst.spec +++ b/os-autoinst.spec @@ -24,24 +24,20 @@ %global github_owner os-autoinst %global github_name os-autoinst %global github_version 4.3 -%global github_commit f5bb0fe960e394f135f49fc7e4cfc0dc2d90ba53 +%global github_commit 0b5d885b30e84a229809d1e9e89b8b42533b8643 # if set, will be a post-release snapshot build, otherwise a 'normal' build -%global github_date 20160712 +%global github_date 20160902 %global shortcommit %(c=%{github_commit}; echo ${c:0:7}) Name: os-autoinst Version: %{github_version} -Release: 21%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} +Release: 25%{?github_date:.%{github_date}git%{shortcommit}}%{?dist} Summary: OS-level test automation License: GPLv2+ Group: Development/System URL: https://os-autoinst.github.io/openQA/ Source0: https://github.com/%{github_owner}/%{github_name}/archive/%{github_commit}/%{github_name}-%{github_commit}.tar.gz -# Fix reset of mouse pointer on assert_and_click to undefined value -# https://github.com/os-autoinst/os-autoinst/pull/559 -Patch0: https://patch-diff.githubusercontent.com/raw/os-autoinst/os-autoinst/pull/559.patch - BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ @@ -195,19 +191,31 @@ make check VERBOSE=1 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.opensuse.os_autoinst.switch.conf %changelog -* Tue Aug 09 2016 Adam Williamson - 4.3.21.20160712gitf5bb0fe +* Sat Sep 03 2016 Adam Williamson - 4.3-25.20160902git0b5d885 +- bump to latest git again, drop merged patches + +* Wed Aug 31 2016 Adam Williamson - 4.3-24.20160826gitcd35b40 +- don't sha1sum qcow assets on shutdown (slow, blocks worker process) + +* Mon Aug 29 2016 Adam Williamson - 4.3-23.20160826gitcd35b40 +- apply PR #571 to try and fix POO #13456 / #12680 + +* Fri Aug 26 2016 Adam Williamson - 4.3-22.20160826gitcd35b40 +- bump to latest git (to get bug fixes, disable verbose JSON logging) + +* Tue Aug 09 2016 Adam Williamson - 4.3-21.20160712gitf5bb0fe - fix an issue with cursor reset after assert_and_click triggering overview -* Tue Jul 12 2016 Adam Williamson - 4.3.20.20160712gitf5bb0fe +* Tue Jul 12 2016 Adam Williamson - 4.3-20.20160712gitf5bb0fe - git bump again (still fixing issues related to the shutdown rewrite) -* Mon Jul 11 2016 Adam Williamson - 4.3.19.20160711git243c036 +* Mon Jul 11 2016 Adam Williamson - 4.3-19.20160711git243c036 - bump to git master one more time for PR #536 (more shutdown stuff) -* Sun Jul 10 2016 Adam Williamson - 4.3.18.20160710gitc5e11ab +* Sun Jul 10 2016 Adam Williamson - 4.3-18.20160710gitc5e11ab - bump to git master once more with merged (updated) PR #534 -* Sun Jul 10 2016 Adam Williamson - 4.3.17.20160708gitcb0f4a8 +* Sun Jul 10 2016 Adam Williamson - 4.3-17.20160708gitcb0f4a8 - bump to current git master again to make PR apply cleanly - backport PR #534 to fix #535 and openQA #781 diff --git a/sources b/sources index ca2af19..04e9082 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -54aef14f0a9249b505d7c8b21814ecd5 os-autoinst-f5bb0fe960e394f135f49fc7e4cfc0dc2d90ba53.tar.gz +9bb7adf430889b271574674b7c5967de os-autoinst-0b5d885b30e84a229809d1e9e89b8b42533b8643.tar.gz