Hello community,

here is the log from the commit of package icewm for openSUSE:Leap:15.2 checked 
in at 2020-05-20 09:06:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/icewm (Old)
 and      /work/SRC/openSUSE:Leap:15.2/.icewm.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "icewm"

Wed May 20 09:06:16 2020 rev:39 rq:806950 version:1.4.2

Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/icewm/icewm.changes    2020-01-15 
15:11:57.098124806 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.icewm.new.2738/icewm.changes  2020-05-20 
09:06:17.228261515 +0200
@@ -1,0 +2,17 @@
+Tue Apr 14 00:51:41 UTC 2020 - Yifan Jiang <[email protected]>
+
+- Explicitly require icewm-theme-branding on SLE and Leap
+  (jsc#SLE-11888, bsc#1170420).
+- Add Conflicts between icewm-config-upstream and icewm-theme-branding.
+
+-------------------------------------------------------------------
+Mon Mar 16 03:45:48 UTC 2020 - Yifan Jiang <[email protected]>
+
+- Improve build tag consistency between SLE and Leap
+  (jsc#SLE-11888, bsc#1170420).
+  * 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.
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ icewm.spec ++++++
--- /var/tmp/diff_new_pack.dKy6Nw/_old  2020-05-20 09:06:17.660262405 +0200
+++ /var/tmp/diff_new_pack.dKy6Nw/_new  2020-05-20 09:06:17.660262405 +0200
@@ -61,7 +61,11 @@
 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
@@ -71,7 +75,7 @@
 # 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}
@@ -95,6 +99,7 @@
 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
@@ -187,17 +192,15 @@
   --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


Reply via email to