From 8af8c6b5c8dfe01984d9ef3624b1027298d7db7f32341707f16a5eaf8a7e4392 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Sun, 25 Oct 2015 20:51:24 +0000
Subject: [PATCH] - Deprecate the gnome subpackage as after investigation we
 figured   we can simply use icewm-menu-fdo to generate the taskbar menu  
 without any need for gnome2 ties. - Drop binary icewm-set-gnomewm as the
 gnome2 is not supported anyway   and thus gconf settings of its defaults are
 bit pointless

OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/icewm?expand=0&rev=44
---
 icewm.changes |  9 +++++++++
 icewm.spec    | 39 +++++++++------------------------------
 2 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/icewm.changes b/icewm.changes
index e326a4d..ab056c5 100644
--- a/icewm.changes
+++ b/icewm.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Sun Oct 25 20:49:42 UTC 2015 - tchvatal@suse.com
+
+- Deprecate the gnome subpackage as after investigation we figured
+  we can simply use icewm-menu-fdo to generate the taskbar menu
+  without any need for gnome2 ties.
+- Drop binary icewm-set-gnomewm as the gnome2 is not supported anyway
+  and thus gconf settings of its defaults are bit pointless
+
 -------------------------------------------------------------------
 Sun Oct 25 12:31:15 UTC 2015 - tchvatal@suse.com
 
diff --git a/icewm.spec b/icewm.spec
index b05ce97..22420a9 100644
--- a/icewm.spec
+++ b/icewm.spec
@@ -34,12 +34,14 @@ BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
+BuildRequires:  pkgconfig
 # Needed for documentation
 BuildRequires:  sgmltool
 BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(fontconfig)
+BuildRequires:  pkgconfig(gdk-pixbuf-xlib-2.0)
 BuildRequires:  pkgconfig(ice)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(sndfile)
@@ -56,12 +58,10 @@ Requires:       xterm
 # if you have the choice, prefer the big one
 Recommends:     icewm-default
 Provides:       windowmanager
+# We use fdo tool to generate menu so no need for gnome subpkg
+Provides:       icewm-gnome = %{version}
+Obsoletes:      icewm-gnome < %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%if %{with gnome}
-BuildRequires:  pkgconfig(gdk-pixbuf-xlib-2.0)
-BuildRequires:  pkgconfig(gnome-desktop-2.0)
-BuildRequires:  pkgconfig(libgnomeui-2.0)
-%endif
 
 %description
 A window manager for the X Window System that can emulate the look of
@@ -101,19 +101,6 @@ 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 gnome
-Summary:        Windowmanager with Taskbar - gnome version
-Group:          System/GUI/GNOME
-Requires:       icewm-default
-
-%description gnome
-Window Manager for X Window System. Can emulate the look of Windows 95,
-OS/2 Warp 3,4, Motif. Tries to take the best features of the above
-systems. Features multiple workspaces, opaque move and resize, task
-bar, window list, mailbox status, digital clock. Fast and small.
-
-This package adds GNOME menu support to icewm.
-
 %lang_package
 
 %prep
@@ -157,16 +144,16 @@ make %{?_smp_mflags} clean
     --enable-antialiasing \
     --enable-gradients \
     --enable-shaped-decorations \
-%if %{with gnome}
-    --enable-menus-gnome2 \
-%endif
-    --enable-i18n
+    --enable-menus-fdo \
+    --disable-menus-gnome2
 make %{?_smp_mflags}
 # patch generated lib/preferences file
 patch -p0 -i %{PATCH99}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
+# First just remove gnome wm setter as we don't have gnome2 anyway
+rm %{buildroot}%{_bindir}/icewm-set-gnomewm
 mkdir -p %{buildroot}%{_sysconfdir}/icewm
 for cfgfile in keys menu preferences toolbar winoptions ; do
 	mv %{buildroot}%{_datadir}/icewm/$cfgfile \
@@ -250,14 +237,6 @@ fi
 %{_bindir}/icewm-menu-fdo
 %{_bindir}/icesound
 
-%if %{with gnome}
-%files gnome
-%defattr(-,root,root)
-%{_bindir}/icewm-menu-gnome2
-%endif
-# make this part of -default without gnome
-%{_bindir}/icewm-set-gnomewm
-
 %files lite
 %defattr(-,root,root)
 %{_bindir}/icewm-lite