From 67da0b4d2e720551f0358b834b36627275b2602b Mon Sep 17 00:00:00 2001
From: Matej Marusak <mmarusak@redhat.com>
Date: Wed, 21 Jul 2021 15:39:21 +0200
Subject: [PATCH] Update to release 249

Related: rhbz#1962078
---
 .gitignore         |  1 +
 cockpit.spec       | 10 +++++++---
 plans/upstream.fmf |  3 +--
 sources            |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6a51495..907818c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -211,3 +211,4 @@
 /cockpit-246.tar.xz
 /cockpit-247.tar.xz
 /cockpit-248.tar.xz
+/cockpit-249.tar.xz
diff --git a/cockpit.spec b/cockpit.spec
index e28fe34..66e5333 100644
--- a/cockpit.spec
+++ b/cockpit.spec
@@ -1,5 +1,5 @@
 # This spec file has been automatically updated
-Version:        248
+Version:        249
 Release: 1%{?dist}
 #
 # Copyright (C) 2014-2020 Red Hat, Inc.
@@ -435,7 +435,6 @@ Recommends: (reportd >= 0.7.1 if abrt)
 %endif
 # NPM modules which are also available as packages
 Provides: bundled(js-jquery) = 3.5.1
-Provides: bundled(js-moment) = 2.29.1
 Provides: bundled(xstatic-bootstrap-datepicker-common) = 1.9.0
 Provides: bundled(xstatic-patternfly-common) = 3.59.5
 
@@ -546,7 +545,7 @@ fi
 test -f %{_bindir}/firewall-cmd && firewall-cmd --reload --quiet || true
 
 # check for deprecated PAM config
-if grep --color=auto pam_cockpit_cert {_sysconfdir}/pam.d/cockpit; then
+if grep --color=auto pam_cockpit_cert %{_sysconfdir}/pam.d/cockpit; then
     echo '**** WARNING:'
     echo '**** WARNING: pam_cockpit_cert is a no-op and will be removed in a'
     echo '**** WARNING: future release; remove it from your /etc/pam.d/cockpit.'
@@ -719,6 +718,11 @@ via PackageKit.
 
 # The changelog is automatically generated and merged
 %changelog
+* Wed Jul 21 2021 Matej Marusak <mmarusak@redhat.com> - 249-1
+- storage: Content table improvements
+- common: Add Content-Type for wasm
+- all: Port away from Moment.js
+
 * Wed Jul 07 2021 Allison Karlitskaya <allison.karlitskaya@redhat.com> - 248-1
 - Metrics: Install missing packages
 - PAM: Deprecate `pam_cockpit_cert` module
diff --git a/plans/upstream.fmf b/plans/upstream.fmf
index 14c3dab..b891c32 100644
--- a/plans/upstream.fmf
+++ b/plans/upstream.fmf
@@ -2,7 +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
-  # 248 plus https://github.com/cockpit-project/cockpit/pull/16067
-  ref: "d1354d46082aa8b2ca039fbc9cf3064218b3d0f5"
+  ref: "249"
 execute:
   how: tmt
diff --git a/sources b/sources
index aef3595..af7a5a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cockpit-248.tar.xz) = 3fcfeed47668171fdaded505477bae1f996a9bce5061624c321e6c511c37ad95ce9c1c8eafe9135a1925dfc61da5a030b8aeb5828778f4c8a342d4affdb40d9d
+SHA512 (cockpit-249.tar.xz) = 1557fc1ca95f41a73d8e639fc122e471bb422850d4f44a2e1a99639bebf68d73c24056188550a1804d18515d1d70c41dcfeda033ed96da3d53c21932fec549c4