From 7d6b80d57e8b4d04311be95043ff99d6d8b458f93d92dd90083b18a38accfee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Mon, 16 Mar 2020 08:55:01 +0000
Subject: [PATCH] Accepting request 785408 from
 home:yfjiang:branches:X11:windowmanagers

- Improve build tag consistency between SLE and Leap.
  * Recommend polkit-gnome to both Leap and SLE.
  * Disable icewm-preferences.patch for Leap. The patch makes sense
    to icewm-config-upstream while Leap uses icewm-theme-branding
    the provide the theme.

OBS-URL: https://build.opensuse.org/request/show/785408
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=105
---
 icewm.changes | 9 +++++++++
 icewm.spec    | 8 +++-----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/icewm.changes b/icewm.changes
index 9066b4d..a421de8 100644
--- a/icewm.changes
+++ b/icewm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Mon Mar 16 03:45:48 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
+
+- Improve build tag consistency between SLE and Leap.
+  * Recommend polkit-gnome to both Leap and SLE. 
+  * Disable icewm-preferences.patch for Leap. The patch makes sense
+    to icewm-config-upstream while Leap uses icewm-theme-branding
+    the provide the theme.
+
 -------------------------------------------------------------------
 Thu Mar  5 02:46:24 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
 
diff --git a/icewm.spec b/icewm.spec
index 64b5c22..c73db66 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -74,7 +74,7 @@ Recommends:     icewm-lang = %{version}
 # For locking you need xscreensaver
 Recommends:     xscreensaver
 Recommends:     xclock
-%if !0%{?is_opensuse}
+%if 0%{?sle_version}
 Recommends:     polkit-gnome
 %endif
 Provides:       icewm-gnome = %{version}
@@ -188,17 +188,15 @@ make %{?_smp_mflags} clean
   --enable-menus-fdo                 \
   --enable-i18n
 make %{?_smp_mflags}
+%if !0%{?sle_version}
 # Patch generated lib/preferences file.
 patch -p1 -i %{PATCH99}
 # And use proper branding
-%if 0%{?is_opensuse}
 wallpaper="openSUSEdefault"
-%else
-wallpaper="SLEdefault"
-%endif
 sed -i \
     -e "s:BRANDING_PICTURE:%{_datadir}/wallpapers/$wallpaper/contents/images/1920x1080.jpg:" \
     src/preferences
+%endif
 
 %install
 %make_install