Accepting request 339212 from home:scarabeus_iv:branches:X11:windowmanagers

- Add back bcond_with gnome conditional as it is redefined on low
  rings

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

icewm.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Oct 16 08:19:51 UTC 2015 - tchvatal@suse.com
+
+- Add back bcond_with gnome conditional as it is redefined on low
+  rings
+
 -------------------------------------------------------------------
 Fri Oct  9 20:02:31 UTC 2015 - tchvatal@suse.com
 

icewm.spec

@@ -17,6 +17,8 @@
 
 
 %global lites icewm icewmhint icewmbg icesh icewm-session
+# default to gnome support, overriden in ring1
+%bcond_without gnome
 Name:           icewm
 Version:        1.3.11
 Release:        0
@@ -31,8 +33,6 @@ BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
-BuildRequires:  gnome-desktop-devel
-BuildRequires:  libgnomeui-devel
 BuildRequires:  libtool
 # Needed for documentation
 BuildRequires:  sgmltool
@@ -40,9 +40,7 @@ BuildRequires:  update-alternatives
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(fontconfig)
 BuildRequires:  pkgconfig(gdk-pixbuf-xlib-2.0)
-BuildRequires:  pkgconfig(gnome-desktop-2.0)
 BuildRequires:  pkgconfig(ice)
-BuildRequires:  pkgconfig(libgnomeui-2.0)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
@@ -56,6 +54,12 @@ Requires:       xdg-menu
 Recommends:     icewm-default
 Provides:       windowmanager
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%if %{with gnome}
+BuildRequires:  gnome-desktop-devel
+BuildRequires:  libgnomeui-devel
+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
@@ -140,16 +144,17 @@ make %{?_smp_mflags} clean
     --docdir=%{_docdir}/%{name} \
     --disable-silent-rules \
     --with-cfgdir=%{_sysconfdir}/icewm \
-    --enable-i18n \
     --enable-nls \
     --enable-corefonts \
     --enable-guievents \
     --enable-antialiasing \
     --enable-gradients \
     --enable-shaped-decorations \
+%if %{with gnome}
     --with-icesound=oss,esd \
     --with-imlib \
     --enable-menus-gnome2 \
+%endif
     --enable-i18n
 make %{?_smp_mflags}
 # patch generated lib/preferences file
@@ -239,9 +244,12 @@ fi
 %{_bindir}/icewm-session
 %{_bindir}/icewm-menu-fdo
 
+%if %{with gnome}
 %files gnome
 %defattr(-,root,root)
 %{_bindir}/icewm-menu-gnome2
+%endif
+# make those two part of -default without gnome
 %{_bindir}/icesound
 %{_bindir}/icewm-set-gnomewm