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
This commit is contained in:
Tomáš Chvátal
2020-03-16 08:55:01 +00:00
committed by Git OBS Bridge
parent 7f965f2fae
commit 7d6b80d57e
2 changed files with 12 additions and 5 deletions

View File

@@ -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