From b26e90606b128be5e89948e57a76c656f7d4b07b009109085250b3db2bd4d164 Mon Sep 17 00:00:00 2001
From: Michael Vetter <jubalh@iodoru.org>
Date: Mon, 8 Jun 2020 09:05:09 +0000
Subject: [PATCH] Accepting request 812031 from
 home:dkondratenko:branches:X11:Wayland

- Add separate branding package

OBS-URL: https://build.opensuse.org/request/show/812031
OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/waybar?expand=0&rev=43
---
 waybar.changes |  5 +++++
 waybar.spec    | 22 +++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/waybar.changes b/waybar.changes
index c41b305..e5264a8 100644
--- a/waybar.changes
+++ b/waybar.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jun  6 07:29:07 UTC 2020 - Denis Kondratenko <denis.kondratenko@suse.com>
+
+- Add separate branding package
+
 -------------------------------------------------------------------
 Sun Apr 12 21:33:24 UTC 2020 - Michael Vetter <mvetter@suse.com>
 
diff --git a/waybar.spec b/waybar.spec
index aaf6765..677377e 100644
--- a/waybar.spec
+++ b/waybar.spec
@@ -53,12 +53,28 @@ BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  pkgconfig(wayland-cursor)
 BuildRequires:  pkgconfig(wayland-protocols)
+# requires branding
+Requires:       %{name}-branding >= %{version}
 # optional: sway integration
 Recommends:     sway
 
 %description
 Customizable Wayland bar for Sway and Wlroots based compositors.
 
+%package branding-upstream
+Summary:        Upstream branding of %{name}
+Group:          System/GUI/Other
+Requires:       %{name} = %{version}
+Supplements:    packageand(%{name}:branding-upstream)
+Conflicts:      otherproviders(%{name}-branding)
+Provides:       %{name}-branding = %{version}
+BuildArch:      noarch
+#BRAND: /etc/xdg/waybar/config contains upstream config
+#BRAND: /etc/xdg/waybar/style.css contains upstream style
+
+%description branding-upstream
+This package provides the upstream look and feel for sway.
+
 %prep
 %setup -q -n Waybar-%{version}
 
@@ -70,9 +86,13 @@ Customizable Wayland bar for Sway and Wlroots based compositors.
 %meson_install
 
 %files
-%{_sysconfdir}/xdg/waybar/
 %{_bindir}/waybar
 %{_mandir}/man?/%{name}*
 %{_prefix}/lib/systemd/user/waybar.service
 
+%files branding-upstream
+%dir %{_sysconfdir}/xdg/waybar
+%config(noreplace) %{_sysconfdir}/xdg/waybar/config
+%config(noreplace) %{_sysconfdir}/xdg/waybar/style.css
+
 %changelog