From 65f2b394da047c49d3550899861a29af6e5ff1aefac1caa3baeef69d4df25a76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= Date: Wed, 14 Oct 2015 10:03:39 +0000 Subject: [PATCH] - Add branding-symlinks.patch, SUSE doesn't carry Fedora pixmaps OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:cockpit/cockpit?expand=0&rev=21 --- branding-symlinks.patch | 45 +++++++++++++++++++++++++++++++++++++++++ cockpit.changes | 2 ++ cockpit.spec | 5 +++++ 3 files changed, 52 insertions(+) create mode 100644 branding-symlinks.patch diff --git a/branding-symlinks.patch b/branding-symlinks.patch new file mode 100644 index 0000000..d5564a3 --- /dev/null +++ b/branding-symlinks.patch @@ -0,0 +1,45 @@ +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cockpit-0.64/branding/centos/Makefile.am ./branding/centos/Makefile.am +--- ../orig-cockpit-0.64/branding/centos/Makefile.am 2015-06-22 18:12:23.000000000 +0200 ++++ ./branding/centos/Makefile.am 2015-10-14 11:56:47.720876974 +0200 +@@ -5,8 +5,7 @@ + branding/centos/bg-login.jpg \ + $(NULL) + +-# Opportunistically use fedora-logos + install-data-hook:: +- $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(centosbrandingdir)/logo.png +- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(centosbrandingdir)/apple-touch-icon.png +- $(LN_S) -f /etc/favicon.png $(DESTDIR)$(centosbrandingdir)/favicon.ico ++ $(LN_S) -f ../default/logo.png $(DESTDIR)$(centosbrandingdir)/logo.png ++ $(LN_S) -f ../default/apple-touch-icon.png $(DESTDIR)$(centosbrandingdir)/apple-touch-icon.png ++ $(LN_S) -f ../default/favicon.ico $(DESTDIR)$(centosbrandingdir)/favicon.ico +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cockpit-0.64/branding/fedora/Makefile.am ./branding/fedora/Makefile.am +--- ../orig-cockpit-0.64/branding/fedora/Makefile.am 2015-06-22 18:12:23.000000000 +0200 ++++ ./branding/fedora/Makefile.am 2015-10-14 11:54:30.418787310 +0200 +@@ -5,8 +5,7 @@ + branding/fedora/bg-login.jpg \ + $(NULL) + +-# Opportunistically use fedora-logos + install-data-hook:: +- $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(fedorabrandingdir)/logo.png +- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(fedorabrandingdir)/apple-touch-icon.png +- $(LN_S) -f /etc/favicon.png $(DESTDIR)$(fedorabrandingdir)/favicon.ico ++ $(LN_S) -f ../default/logo.png $(DESTDIR)$(fedorabrandingdir)/logo.png ++ $(LN_S) -f ../default/apple-touch-icon.png $(DESTDIR)$(fedorabrandingdir)/apple-touch-icon.png ++ $(LN_S) -f ../default/favicon.ico $(DESTDIR)$(fedorabrandingdir)/favicon.ico +diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-cockpit-0.64/branding/rhel/Makefile.am ./branding/rhel/Makefile.am +--- ../orig-cockpit-0.64/branding/rhel/Makefile.am 2015-06-22 18:12:23.000000000 +0200 ++++ ./branding/rhel/Makefile.am 2015-10-14 11:53:47.144867940 +0200 +@@ -5,8 +5,7 @@ + branding/rhel/bg-login.jpg \ + $(NULL) + +-# Opportunistically use redhat-logos ... yes they're called 'fedora' + install-data-hook:: +- $(LN_S) -f /usr/share/pixmaps/system-logo-white.png $(DESTDIR)$(rhelbrandingdir)/logo.png +- $(LN_S) -f /usr/share/pixmaps/fedora-logo-sprite.png $(DESTDIR)$(rhelbrandingdir)/apple-touch-icon.png +- $(LN_S) -f /etc/favicon.png $(DESTDIR)$(rhelbrandingdir)/favicon.ico ++ $(LN_S) -f ../default/logo.png $(DESTDIR)$(rhelbrandingdir)/logo.png ++ $(LN_S) -f ../default/apple-touch-icon.png $(DESTDIR)$(rhelbrandingdir)/apple-touch-icon.png ++ $(LN_S) -f ../default/favicon.ico $(DESTDIR)$(rhelbrandingdir)/favicon.ico diff --git a/cockpit.changes b/cockpit.changes index d7ea64f..b0bdbca 100644 --- a/cockpit.changes +++ b/cockpit.changes @@ -8,6 +8,8 @@ Tue Oct 13 11:41:44 UTC 2015 - kkaempf@suse.com See https://github.com/cockpit-project/cockpit/releases +- Add branding-symlinks.patch, SUSE doesn't carry Fedora pixmaps + ------------------------------------------------------------------- Sat Feb 7 13:22:23 UTC 2015 - kkaempf@suse.com diff --git a/cockpit.spec b/cockpit.spec index a4c05a0..eac85c1 100644 --- a/cockpit.spec +++ b/cockpit.spec @@ -74,6 +74,8 @@ Source1: cockpit-suse.pam %else Source1: cockpit-fedora.pam %endif +# openSUSE doesn't carry Fedora branding pixmaps +Patch1: branding-symlinks.patch BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(json-glib-1.0) @@ -191,6 +193,9 @@ The Cockpit Web Service listens on the network, and authenticates users. %if 0%{?fedora} == 20 sed -i s/unconfined_service_t/unconfined_t/g src/ws/test-server.service.in %endif +%if 0%{?suse_version} +%patch1 -p1 +%endif %build %if %{defined gitcommit}