Accepting request 529925 from home:avindra

- Update to 1.4.2
- Rebase patches
  - icewm-susemenu.patch: rebase "suseprog" function
  - icewm-preferences.patch: rebase, only IconPath hunk not in upstream now
  - icewm-mate.patch: rebase several hunks in which context changed
- Drop patches that were accepted upstream
  - icewm-session-desktop.patch
  - icewm-exit-fork.patch
  - icewm-mail.patch
- Swap "sgmltool" for "asciidoc"

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

icewm.spec

@@ -18,34 +18,27 @@
 
 %global lites icewm icewmhint icewmbg icesh icewm-session
 Name:           icewm
-Version:        1.3.12
+Version:        1.4.2
 Release:        0
 Summary:        Window Manager with a Taskbar
 License:        LGPL-2.1+
 Group:          System/GUI/Other
 Url:            http://www.icewm.org/
-Source0:        https://github.com/bbidulock/icewm/archive/%{version}.tar.gz
+Source0:        https://github.com/bbidulock/%{name}/releases/download/%{version}/%{name}-%{version}.tar.bz2
 Source1:        icewm.desktop
 # PATCH-FIX-OPENSUSE icewm-mate.patch sor.alexei@meowr.ru -- Add MATE Menus support.
 Patch0:         icewm-mate.patch
 # PATCH-FEATURE-SUSE icewm-susemenu.patch tyang@suse.com -- Add xdg-menu for SLED icewm
 Patch1:         icewm-susemenu.patch
-# PATCH-FIX-UPSTREAM tweak the desktop session files to work correctly
-Patch2:         icewm-session-desktop.patch
-# PATCH-FIX-OPENSUSE run shutdown and reboot in background
-Patch3:         icewm-exit-fork.patch
-# Fix for bsc#1026134, replace alpine by an alternative being available by
-# default on SLE/openSUSE, same as done on Debian
-Patch4:         icewm-mail.patch
 Patch99:        icewm-preferences.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
 # Needed for documentation.
-BuildRequires:  pkg-config
-BuildRequires:  sgmltool
+BuildRequires:  asciidoc
 BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(alsa)
@@ -65,11 +58,6 @@ Requires:       desktop-data
 Requires:       icewm-bin
 Requires:       icewm-configuration-files
 Requires:       xdg-menu
-%if 0%{?suse_version} > 1315
-Requires:       xterm-bin
-%else
-Requires:       xterm
-%endif
 Requires(post): update-alternatives
 Requires(postun): update-alternatives
 # If you have the choice, prefer the big one.
@@ -80,6 +68,11 @@ Recommends:     xlockmore
 Provides:       icewm-gnome = %{version}
 Obsoletes:      icewm-gnome < %{version}
 Provides:       windowmanager
+%if 0%{?suse_version} > 1315
+Requires:       xterm-bin
+%else
+Requires:       xterm
+%endif
 
 %description
 A window manager for the X Window System that can emulate the look
@@ -140,9 +133,6 @@ mailbox status, and a digital clock. It is fast and small.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
 # Do not require needlessly new gettext.
 sed -i 's/0.19.6/0.18.3/g' configure.ac
 
@@ -194,7 +184,7 @@ wallpaper="openSUSEdefault"
 wallpaper="SLEdefault"
 %endif
 sed -i \
-    -e "s:BRANDING_PICTURE:/usr/share/wallpapers/$wallpaper/contents/images/1920x1080.jpg:" \
+    -e "s:BRANDING_PICTURE:%{_datadir}/wallpapers/$wallpaper/contents/images/1920x1080.jpg:" \
     src/preferences
 
 %install
@@ -267,7 +257,6 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %files
-%defattr(-,root,root)
 %doc %{_docdir}/icewm
 %ghost %{_sysconfdir}/alternatives/default-xsession.desktop
 %{_datadir}/icewm/
@@ -277,15 +266,12 @@ fi
 %{_mandir}/man1/icewm.1%{?ext_man}
 
 %files config-upstream
-%defattr(-,root,root)
 %dir %{_sysconfdir}/icewm/
 %config %{_sysconfdir}/icewm/*
 
 %files lang -f icewm.lang
-%defattr(-,root,root)
 
 %files default
-%defattr(-,root,root)
 %ghost %{_sysconfdir}/alternatives/icewm
 %ghost %{_sysconfdir}/alternatives/icewmhint
 %ghost %{_sysconfdir}/alternatives/icewmbg
@@ -308,7 +294,6 @@ fi
 %{_datadir}/applications/icewm.desktop
 
 %files lite
-%defattr(-,root,root)
 %ghost %{_sysconfdir}/alternatives/icewm
 %ghost %{_sysconfdir}/alternatives/icewmhint
 %ghost %{_sysconfdir}/alternatives/icewmbg