From 8a9432444d157b90a347294b14405624df0258cf Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Nov 15 2019 23:26:40 +0000 Subject: Update login screen to use CentOS background --- diff --git a/SOURCES/0001-Update-Makefile.am.patch b/SOURCES/0001-Update-Makefile.am.patch new file mode 100644 index 0000000..6588f35 --- /dev/null +++ b/SOURCES/0001-Update-Makefile.am.patch @@ -0,0 +1,11 @@ +diff --git a/src/branding/centos/Makefile.am b/src/branding/centos/Makefile.am +index 4b60735..0d32e10 100644 +--- a/src/branding/centos/Makefile.am ++++ b/src/branding/centos/Makefile.am +@@ -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/0002-Update-background-image-and-login-pf-container.patch b/SOURCES/0002-Update-background-image-and-login-pf-container.patch new file mode 100644 index 0000000..0f82e54 --- /dev/null +++ b/SOURCES/0002-Update-background-image-and-login-pf-container.patch @@ -0,0 +1,19 @@ +diff --git a/src/branding/centos/branding.css b/branding.css +index 070aa59..4fb5bc8 100644 +--- a/src/branding/centos/branding.css ++++ b/src/branding/centos/branding.css +@@ -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/SOURCES/centos-00-add-bg-plain-png.patch b/SOURCES/centos-00-add-bg-plain-png.patch deleted file mode 100644 index 9587f9a..0000000 --- a/SOURCES/centos-00-add-bg-plain-png.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 9a9e0b0..0000000 --- a/SOURCES/centos-01-update-login-screen-background-image.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- 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 e0de9b2..58c2f6f 100644 --- a/SPECS/cockpit.spec +++ b/SPECS/cockpit.spec @@ -94,8 +94,8 @@ Source0: https://github.com/cockpit-project/cockpit/releases/download/%{v %endif Source1: bg-plain.png -Patch0: centos-00-add-bg-plain-png.patch -Patch1: centos-01-update-login-screen-background-image.patch +Patch0: 0001-Update-Makefile.am.patch +Patch1: 0002-Update-background-image-and-login-pf-container.patch BuildRequires: gcc BuildRequires: pkgconfig(gio-unix-2.0) @@ -161,6 +161,9 @@ Suggests: cockpit-selinux %prep %setup -q -n cockpit-%{version} +%patch0 -p1 +%patch1 -p1 +cp %{SOURCE1} src/branding/centos/ %build exec 2>&1 @@ -830,6 +833,9 @@ via PackageKit. # The changelog is automatically generated and merged %changelog +* Wed Nov 13 2019 Alain Reguera Delgado - 196.3-1 +- Update login screen to use CentOS background + * Fri Sep 13 2019 Martin Pitt - 196.3-1 - systemd: Warn if not connected to Insights (rhbz#1745964)