From 4c48bc7904161f60b78cc9a212c0b5640f01d902 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Jan 02 2024 23:09:12 +0000
Subject: Update to recent upstream git, resync spec


---

diff --git a/.gitignore b/.gitignore
index d5675f6..731e6bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -124,3 +124,5 @@
 /assetcache-c944acc8be48645a4e5d8e98882e4e54fcf85287.tar.xz
 /openQA-872b39721c693fc06ede88b366975bf4e2352c7d.tar.gz
 /assetcache-872b39721c693fc06ede88b366975bf4e2352c7d.tar.xz
+/openQA-b96c049bb1bb7f305bc170e4d181baa3bc691de3.tar.gz
+/assetcache-b96c049bb1bb7f305bc170e4d181baa3bc691de3.tar.xz
diff --git a/openqa.spec b/openqa.spec
index 8a5f5b3..3d7ed33 100644
--- a/openqa.spec
+++ b/openqa.spec
@@ -23,9 +23,9 @@
 %global github_owner    os-autoinst
 %global github_name     openQA
 %global github_version  4.6
-%global github_commit   872b39721c693fc06ede88b366975bf4e2352c7d
+%global github_commit   b96c049bb1bb7f305bc170e4d181baa3bc691de3
 # if set, will be a post-release snapshot build, otherwise a 'normal' build
-%global github_date     20231125
+%global github_date     20231222
 %global shortcommit     %(c=%{github_commit}; echo ${c:0:7})
 
 # can't use linebreaks here!
@@ -42,14 +42,14 @@
 %define python_scripts_requires python3-requests openqa-client
 
 # The following line is generated from dependencies.yaml (upstream)
-%define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36
+%define assetpack_requires perl(CSS::Minifier::XS) >= 0.01 perl(JavaScript::Minifier::XS) >= 0.11 perl(Mojolicious::Plugin::AssetPack) >= 1.36 perl(YAML::PP) >= 0.026
 # Diff from SUSE: we use 'perl-interpreter' where they use 'perl',
 # our 'perl' is a metapackage and we don't want all of it
 # we use 'chrony' where they use 'ntp-daemon'
 # their versioning of mojolicious is different due to
 # https://github.com/openSUSE/cpanspec/issues/47
 # The following line is generated from dependencies.yaml (upstream)
-%define common_requires chrony perl-interpreter >= 5.20.0 perl(Carp::Always) >= 0.14.02 perl(Config::IniFiles) perl(Config::Tiny) perl(Cpanel::JSON::XS) >= 4.09 perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Filesys::Df) perl(Getopt::Long) perl(Minion) >= 10.25 perl(Mojolicious) >= 9.34 perl(Regexp::Common) perl(Storable) perl(Time::Moment) perl(Try::Tiny)
+%define common_requires chrony perl-interpreter >= 5.20.0 perl(Carp::Always) >= 0.14.02 perl(Config::IniFiles) perl(Config::Tiny) perl(Cpanel::JSON::XS) >= 4.09 perl(Cwd) perl(Data::Dump) perl(Data::Dumper) perl(Digest::MD5) perl(Filesys::Df) perl(Getopt::Long) perl(Minion) >= 10.25 perl(Mojolicious) >= 9.34 perl(Regexp::Common) perl(Storable) perl(Text::Glob) perl(Time::Moment) perl(Try::Tiny)
 # Diff from SUSE: we package bsdcat and bsdtar separately
 # runtime requirements for the main package that are not required by other sub-packages
 # The following line is generated from dependencies.yaml (upstream)
@@ -290,7 +290,6 @@ helper for interacting with the openQA REST API.
 
 %package python-scripts
 Summary:        Additional scripts in python
-Group:          Development/Tools/Other
 Requires:       %python_scripts_requires
 
 %description python-scripts
@@ -321,7 +320,6 @@ Use this package to setup a local instance with all services provided together.
 
 %package single-instance-nginx
 Summary:        Convenience package for a single-instance setup using nginx proxy
-Group:          Development/Tools/Other
 Requires:       %{name}-local-db
 Requires:       %{name} = %{version}
 Requires:       %{name}-worker = %{version}
@@ -346,7 +344,6 @@ writing, etc., covering both openQA and the os-autoinst test engine.
 
 %package munin
 Summary:        Munin scripts
-Group:          Development/Tools/Other
 Requires:       munin
 Requires:       munin-node
 Requires:       curl
@@ -742,6 +739,9 @@ fi
 %{_datadir}/openqa/lib/OpenQA/WebAPI/Plugin/FedoraUpdateRestart.pm
 
 %changelog
+* Tue Jan 02 2024 Adam Williamson <awilliam@redhat.com> - 4.6^20231222gitb96c049-1
+- Update to recent upstream git, resync spec
+
 * Mon Nov 27 2023 Adam Williamson <awilliam@redhat.com> - 4.6^20231125git872b397-1
 - Update to recent upstream git, resync spec, drop merged patch
 
diff --git a/sources b/sources
index de4f0aa..9b42426 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (openQA-872b39721c693fc06ede88b366975bf4e2352c7d.tar.gz) = 793ea03384551150a3e77180115065fcb37d1abaed851e93dc8192eb60db8fe200116f39173fb3e8f64a3f4d5efc6251b3c72fcd954f7f8f52404bb2bc7415f7
-SHA512 (assetcache-872b39721c693fc06ede88b366975bf4e2352c7d.tar.xz) = f5fb7462d1d46cbd593b4c7449a285f6ae985c3156df06775b4105b47b21a4d9551b529ce0a0ecf41fd290c6fa2cfca5ad04aa09d7839420faf7bfee3ffcea7f
+SHA512 (openQA-b96c049bb1bb7f305bc170e4d181baa3bc691de3.tar.gz) = fc56762373ebcd85c7a8c4b93093c0b01699ff895341ace914661349fe66d23727247eb20aa1859031355e25192f435e4beab1880b9b7cc08559d29b0257bb17
+SHA512 (assetcache-b96c049bb1bb7f305bc170e4d181baa3bc691de3.tar.xz) = 6ec386e55526369d6df513058d88fc277d41b696c1c0c3e760548ab090b1b8ce249d262c6d8c5feb2de42e4651739746963155ab354d6bb1a4e6f4c37f234faf