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