From 266a8dfe4ef2cc42120d83c3fc0cdf4136a232c5 Mon Sep 17 00:00:00 2001
From: Cockpit Project <cockpituous@gmail.com>
Date: Wed, 30 Mar 2022 11:11:41 +0000
Subject: [PATCH] Update to 266-1

- Update to upstream 266 release
---
 .gitignore         |  1 +
 cockpit.spec       | 17 +++++++++++++----
 plans/upstream.fmf |  2 +-
 sources            |  2 +-
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2c20c6a..cb9ec13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -229,3 +229,4 @@
 /cockpit-263.tar.xz
 /cockpit-264.tar.xz
 /cockpit-265.tar.xz
+/cockpit-266.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index ae60e10..9bea212 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        265
+Version:        266
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -52,7 +52,7 @@ Summary:        Web Console for Linux servers
 License:        LGPLv2+
 URL:            https://cockpit-project.org/
 
-Source0:        https://github.com/cockpit-project/cockpit/releases/download/265/cockpit-265.tar.xz
+Source0:        https://github.com/cockpit-project/cockpit/releases/download/266/cockpit-266.tar.xz
 
 # in RHEL 8 the source package is duplicated: cockpit (building basic packages like cockpit-{bridge,system})
 # and cockpit-appstream (building optional packages like cockpit-{pcp})
@@ -90,7 +90,13 @@ BuildRequires: pam-devel
 BuildRequires: autoconf automake
 BuildRequires: make
 BuildRequires: /usr/bin/python3
+%if 0%{?rhel} && 0%{?rhel} <= 8
+# RHEL 8's gettext does not yet have metainfo.its
 BuildRequires: gettext >= 0.19.7
+BuildRequires: libappstream-glib-devel
+%else
+BuildRequires: gettext >= 0.21
+%endif
 %if 0%{?build_basic}
 BuildRequires: libssh-devel >= 0.8.5
 %endif
@@ -530,8 +536,8 @@ fi
 
 %package kdump
 Summary: Cockpit user interface for kernel crash dumping
-Requires: cockpit-bridge >= 122
-Requires: cockpit-shell >= 122
+Requires: cockpit-bridge >= 130
+Requires: cockpit-shell >= 130
 Requires: kexec-tools
 BuildArch: noarch
 
@@ -677,6 +683,9 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Mar 30 2022 Cockpit Project <cockpituous@gmail.com> - 266-1
+- Update to upstream 266 release
+
 * Wed Mar 16 2022 Cockpit Project <cockpituous@gmail.com> - 265-1
 - Update to upstream 265 release
 
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index eac39fa..a6e55ac 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,6 +2,6 @@ discover:
   how: fmf
   repository: https://github.com/cockpit-project/cockpit
   # FIXME: get rid of the hardcoding: https://github.com/psss/tmt/issues/585
-  ref: "265"
+  ref: "266"
 execute:
   how: tmt
diff --git a/sources b/sources
index 73c6aa0..8af4427 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-265.tar.xz) = 182692b65dd335a6a7af972a2881835ac6872892a6f68ed12346311def5613fbfaab592db5b8beb1528857bd59d24ecf0ada7849067a46d29f7038f033d8722b
+SHA512 (cockpit-266.tar.xz) = a7c1003b176764c88049abf598794b7f9de7653be1d22fa3867251f5fdc89690318df2c9d3564d5caefa70dfdc0b358e8c92c98a4999174a32af88557d067441