From 8bb7a9caec66edc819b2cdfab645999a8a2b3ce2 Mon Sep 17 00:00:00 2001
From: Cockpit Project <cockpituous@gmail.com>
Date: Wed, 29 Sep 2021 12:37:30 +0000
Subject: [PATCH] Update to 254-1

- Overview: Move last login to Health Card
- Webserver: Restrict frame embedding to same origin
- Login: Add Arch Linux branding
- Users: Add login history
---
 .gitignore         |  1 +
 cockpit.spec       | 13 ++++++++++---
 plans/upstream.fmf |  2 +-
 sources            |  2 +-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a925869..ebef4d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -216,3 +216,4 @@
 /cockpit-251.tar.xz
 /cockpit-252.tar.xz
 /cockpit-253.tar.xz
+/cockpit-254.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index 27d5ccc..a234a8b 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        253
+Version:        254
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -220,7 +220,9 @@ install -D -p -m 644 AUTHORS COPYING README.md %{buildroot}%{_docdir}/cockpit/
 %endif
 
 # Build the package lists for resource packages
-echo '%dir %{_datadir}/cockpit/base1' > base.list
+# cockpit-bridge is the basic dependency for all cockpit-* packages, so centrally own the page directory
+echo '%dir %{_datadir}/cockpit' > base.list
+echo '%dir %{_datadir}/cockpit/base1' >> base.list
 echo '%dir %{_datadir}/cockpit/base1/fonts' >> base.list
 find %{buildroot}%{_datadir}/cockpit/base1 -type f -o -type l >> base.list
 echo '%{_sysconfdir}/cockpit/machines.d' >> base.list
@@ -356,7 +358,6 @@ troubleshooting, interactive command-line sessions, and more.
 %{_docdir}/cockpit/AUTHORS
 %{_docdir}/cockpit/COPYING
 %{_docdir}/cockpit/README.md
-%dir %{_datadir}/cockpit
 %{_datadir}/metainfo/cockpit.appdata.xml
 %{_datadir}/pixmaps/cockpit.png
 %doc %{_mandir}/man1/cockpit.1.gz
@@ -713,6 +714,12 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Sep 29 2021 Matej Marusak <mmarusak@redhat.com> - 254-1
+- Overview: Move last login to Health Card
+- Webserver: Restrict frame embedding to same origin
+- Login: Add Arch Linux branding
+- Users: Add login history
+
 * Wed Sep 15 2021 Katerina Koukiou <kkoukiou@redhat.com> - 253-1
 - SELinux: Dismiss multiple alerts
 
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index e2374a2..76b01aa 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: "253"
+  ref: "254"
 execute:
   how: tmt
diff --git a/sources b/sources
index 892488c..57df689 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-253.tar.xz) = d2d6677d2a780f428c5db7f636344acbb685c4ee94fe53bc84604551b8d367134cf7363f5866edc6efbee7d293303fb89754f2e5175c3f439b24ba0f0567d9a3
+SHA512 (cockpit-254.tar.xz) = f8c8c5986f03a05ae08db1c2341068f22593fdb2d96bef0afefc8316c0887ef26d41a08e7fc49832a3051545dfcad027f089c9efb4e5d7c40d1c73fd24e91bbf