- Kill back the mate subpkg as it does not really pose any benefit

for us. But keep the patch as it should be merged upstream

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

icewm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct 26 10:06:43 UTC 2015 - tchvatal@suse.com
+
+- Kill back the mate subpkg as it does not really pose any benefit
+  for us. But keep the patch as it should be merged upstream
+
 -------------------------------------------------------------------
 Mon Oct 26 07:10:58 UTC 2015 - tchvatal@suse.com
 

icewm.spec

@@ -17,12 +17,6 @@
 
 
 %global lites icewm icewmhint icewmbg icesh icewm-session
-# Default to mate support, overriden in ring1.
-%if 0%{?suse_version} >= 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
-%bcond_without mate
-%else
-%bcond_with mate
-%endif
 Name:           icewm
 Version:        1.3.11
 Release:        0
@@ -65,12 +59,11 @@ Requires:       desktop-data
 Requires:       icewm-bin
 Requires:       xdg-menu
 Requires:       xterm
+Provides:       icewm-gnome = %{version}                                       
+Obsoletes:      icewm-gnome < %{version}
 # If you have the choice, prefer the big one.
 Recommends:     icewm-default
 Provides:       windowmanager
-%if %{with mate}
-BuildRequires:  pkgconfig(mate-desktop-2.0)
-%endif
 
 %description
 A window manager for the X Window System that can emulate the look
@@ -110,22 +103,6 @@ take the best features from those systems. IceWM features multiple
 workspaces, opaque move and resize, a taskbar, a window list,
 mailbox status, and a digital clock. It is fast and small.
 
-%package mate
-Summary:        Windowmanager with Taskbar -- MATE Version
-Group:          System/GUI/Other
-Requires:       icewm-default
-Provides:       icewm-gnome = %{version}
-Obsoletes:      icewm-gnome < %{version}
-
-%description mate
-A window manager for the X Window System that can emulate the look
-of Windows '95, OS/2 Warp 3, OS/2 Warp 4, and Motif and tries to
-take the best features from those systems. IceWM features multiple
-workspaces, opaque move and resize, a taskbar, a window list,
-mailbox status, and a digital clock. It is fast and small.
-
-This package adds MATE menu support to IceWM.
-
 %lang_package
 
 %prep
@@ -172,9 +149,6 @@ make %{?_smp_mflags} clean
   --enable-gradients                 \
   --enable-shaped-decorations        \
   --enable-menus-fdo                 \
-%if %{with mate}
-  --enable-menus-mate                \
-%endif
   --enable-i18n
 make %{?_smp_mflags}
 # Patch generated lib/preferences file.
@@ -184,7 +158,7 @@ patch -p1 -i %{PATCH99}
 %make_install
 
 # First just remove GNOME WM setter as we don't have GNOME 2 anyway.
-rm -f %{buildroot}%{_bindir}/icewm-set-gnomewm
+rm -f %{buildroot}%{_bindir}/icewm-set-{gnomewm,matewm}
 
 mkdir -p %{buildroot}%{_sysconfdir}/icewm/
 for cfgfile in keys menu preferences toolbar winoptions ; do
@@ -270,14 +244,7 @@ fi
 %{_bindir}/icesh
 %{_bindir}/icewm-session
 %{_bindir}/icewm-menu-fdo
-
-%if %{with mate}
-%files mate
-%defattr(-,root,root)
-%{_bindir}/icewm-menu-mate
-%endif
 %{_datadir}/applications/icewm.desktop
-%{_bindir}/icewm-set-matewm
 
 %files lite
 %defattr(-,root,root)