From 7cfbf65f580a94152a6e12a8e5b45fd349c46d56 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Nov 12 2019 10:00:56 +0000 Subject: Update login screen with CentOS background - Revert .cockpit.metadata to use c8 default .tar.xz file. The previous one was wrongly modified. We don't modify tar.xz, but patch them instead. - Add patches to change branding.css and Makefile.am. - Add SOURCES/centos-00-add-bg-plain-png.patch to consider bg-plain.png. - Add SOURCES/centos-01-update-login-screen-background-image.patch to change the background presentation in branding.css. It is now aligned to the top-right corner on the screen. - The semi-transparent remarking the login box was removed. To make the background image look better. This is also convenient because FreeIPA login screen is not using it either. - Update the SPEC/cockpit.spec file to add bg-plain.png source, patches and a change log entry. --- diff --git a/.cockpit.metadata b/.cockpit.metadata index 0998389..89c0899 100644 --- a/.cockpit.metadata +++ b/.cockpit.metadata @@ -1 +1 @@ -dd7928a22cd5a25362823bd3e78ed537c65a882c SOURCES/cockpit-185.1.tar.xz +9d2e17cbe49f01a554b362d32ff53504c2345bd1 SOURCES/cockpit-185.1.tar.xz diff --git a/SOURCES/bg-plain.png b/SOURCES/bg-plain.png new file mode 100644 index 0000000..833deb5 Binary files /dev/null and b/SOURCES/bg-plain.png differ diff --git a/SOURCES/centos-00-add-bg-plain-png.patch b/SOURCES/centos-00-add-bg-plain-png.patch new file mode 100644 index 0000000..9587f9a --- /dev/null +++ b/SOURCES/centos-00-add-bg-plain-png.patch @@ -0,0 +1,10 @@ +--- src/branding/centos/Makefile.am.original 2019-11-10 00:25:00.631384212 -0300 ++++ src/branding/centos/Makefile.am 2019-11-10 00:25:43.836027445 -0300 +@@ -1,6 +1,7 @@ + centosbrandingdir = $(datadir)/cockpit/branding/centos + + centosbranding_DATA = \ ++ src/branding/centos/bg-plain.png \ + src/branding/centos/branding.css \ + $(NULL) + diff --git a/SOURCES/centos-01-update-login-screen-background-image.patch b/SOURCES/centos-01-update-login-screen-background-image.patch new file mode 100644 index 0000000..9a9e0b0 --- /dev/null +++ b/SOURCES/centos-01-update-login-screen-background-image.patch @@ -0,0 +1,17 @@ +--- src/branding/centos/branding.css.original 2019-11-10 00:29:57.431933351 -0300 ++++ src/branding/centos/branding.css 2019-11-10 00:30:13.179803312 -0300 +@@ -1,9 +1,13 @@ + body.login-pf { +- background: url("bg-plain.jpg") no-repeat 50% 0; ++ background: url("bg-plain.png") no-repeat 100% 0; + background-size: auto; + background-color: #101010; + } + ++body.login-pf .container { ++ background-color: rgba(255,255,255,0); ++} ++ + #badge { + width: 225px; + height: 80px; diff --git a/SPECS/cockpit.spec b/SPECS/cockpit.spec index d8e63fa..92a9d66 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -88,6 +88,10 @@ Source0: cockpit-%{version}.tar.gz Source0: https://github.com/cockpit-project/cockpit/releases/download/%{version}/cockpit-%{version}.tar.xz %endif +Source1: bg-plain.png +Patch0: centos-00-add-bg-plain-png.patch +Patch1: centos-01-update-login-screen-background-image.patch + BuildRequires: gcc BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(json-glib-1.0) @@ -833,8 +837,8 @@ via PackageKit. # The changelog is automatically generated and merged %changelog -* Sun Jul 21 2019 Alain Reguera Delagdo - 185.1-2 -- Add CentOS background image to login screen. +* Tue Nov 12 2019 Alain Reguera Delagdo - 185.1-2 +- Update login screen with CentOS background. * Fri May 24 2019 Martin Pitt - 185.1-1 - system: Add CPU security mitigations dialog rhbz#1713186