Accepting request 794858 from home:yfjiang:branches:X11:windowmanagers

- Explicitly require icewm-theme-branding on SLE and Leap. 
- Add Conflicts between icewm-config-upstream and icewm-theme-branding

OBS-URL: https://build.opensuse.org/request/show/794858
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=107

icewm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 14 00:51:41 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
+
+- Explicitly require icewm-theme-branding on SLE and Leap. 
+- Add Conflicts between icewm-config-upstream and icewm-theme-branding
+
 -------------------------------------------------------------------
 Mon Mar 16 03:45:48 UTC 2020 - Yifan Jiang <yfjiang@suse.com>
 

icewm.spec

@@ -64,7 +64,11 @@ BuildRequires:  pkgconfig(xrandr)
 Requires:       alsa-utils
 Requires:       desktop-data
 Requires:       icewm-bin
+%if !0%{?sle_version}
 Requires:       icewm-configuration-files
+%else
+Requires:       icewm-theme-branding
+%endif
 Requires:       xdg-menu
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
@@ -98,6 +102,7 @@ Summary:        Window Manager with a Taskbar -- Default configuration
 Group:          System/GUI/Other
 Provides:       icewm-configuration-files = %{version}
 BuildArch:      noarch
+Conflicts:      icewm-theme-branding
 
 %description config-upstream
 A window manager for the X Window System that can emulate the look