diff --git a/0001-packagekit-Add-stylesheet-for-the-Buttons-on-Softwar.patch b/0001-packagekit-Add-stylesheet-for-the-Buttons-on-Softwar.patch new file mode 100644 index 0000000..486e1e8 --- /dev/null +++ b/0001-packagekit-Add-stylesheet-for-the-Buttons-on-Softwar.patch @@ -0,0 +1,24 @@ +From 6cfac968011d17f8ec94da8d028b6879cd3f69da Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Thu, 5 Mar 2020 12:13:15 +0100 +Subject: [PATCH] packagekit: Add stylesheet for the Buttons on 'Software + Updates' page + +Closes #13657 +--- + pkg/packagekit/updates.scss | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/pkg/packagekit/updates.scss b/pkg/packagekit/updates.scss +index 48ac3d776..2a2ab32ed 100644 +--- a/pkg/packagekit/updates.scss ++++ b/pkg/packagekit/updates.scss +@@ -1,3 +1,5 @@ ++@import "../../node_modules/@patternfly/patternfly/components/Button/button.scss"; ++ + .pk-updates--header { + display: flex; + flex-wrap: wrap; +-- +2.25.1 + diff --git a/cockpit.spec b/cockpit.spec index 5cda1c7..cdd4886 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -1,6 +1,6 @@ # This spec file has been automatically updated Version: 214 -Release: 1%{?dist} +Release: 2%{?dist} # # This file is maintained at the following location: # https://github.com/cockpit-project/cockpit/blob/master/tools/cockpit.spec @@ -62,6 +62,11 @@ Source0: cockpit-%{version}.tar.gz Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz %endif +# Fix button theming on Software Updates page +# https://github.com/cockpit-project/cockpit/issues/13653 +# https://github.com/cockpit-project/cockpit/pull/13657 +Patch0: 0001-packagekit-Add-stylesheet-for-the-Buttons-on-Softwar.patch + BuildRequires: gcc BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(json-glib-1.0) @@ -119,6 +124,7 @@ Recommends: subscription-manager-cockpit %prep %setup -q -n cockpit-%{version} +%patch0 -p1 %build exec 2>&1 @@ -664,6 +670,10 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Mar 11 2020 Adam Williamson - 214-2 + +- Backport PR #13657 to fix Software Updates pane button theming + * Wed Mar 04 2020 Martin Pitt - 214-1 - Networking: List Firewall active zones when unprivileged