- replaced f* up icewm-menu-gnome{1,2} with wmconfig,

- release 2.

Changed files:
    icewm.spec -> 1.132

diff --git a/icewm.spec b/icewm.spec
index 6588c866a3025c7d1e9984197aa51ae48802b5f4..fefc5a80d938d17cd86eeb4be5931284c51f3202 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -4,7 +4,7 @@
 # _without_antialiasing        - disable antialiasing
 # _without_freetype    - disable xfreetype support (implies _without_antialiasing)
 # _without_guievents   - disable guievents
-# _without_gnome       - disable GNOME support
+# _with_gnome          - enable GNOME support
 # _without_imlib       - disable imlib support
 #
 # TODO:
@@ -20,7 +20,7 @@ Summary(ru):  
 Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          icewm
 Version:       1.2.9
-Release:       1
+Release:       2
 Epoch:         2
 License:       LGPL
 Group:         X11/Window Managers
@@ -40,7 +40,7 @@ BuildRequires:        autoconf
 BuildRequires: automake
 %{!?_without_guievents:BuildRequires:  esound-devel}
 BuildRequires: gettext-devel
-%{!?_without_gnome:BuildRequires:      gnome-desktop-devel}
+%{?_with_gnome:BuildRequires:  gnome-desktop-devel}
 %{!?_without_imlib:BuildRequires:      imlib-devel}
 BuildRequires: libstdc++-devel
 %{!?_without_freetype:BuildRequires:   xft-devel >= 2.1}
@@ -127,7 +127,7 @@ rm -f missing
        %{!?_without_antialiasing:--enable-antialiasing} \
        %{?_without_freetype:--disable-xfreetype} \
        %{!?_without_guievents:--enable-guievents} \
-       %{!?_without_gnome:--enable-menus-gnome} \
+       %{?_with_gnome:--enable-menus-gnome} \
        %{?_without_imlib:--without-imlib} \
        --enable-shaped-decorations \
        --with-cfgdir=%{_sysconfdir}/X11/%{name} \
@@ -152,7 +152,7 @@ install lib/winoptions $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/winoptions
 
 ln -s %{_datadir}/icewm/icons $RPM_BUILD_ROOT%{_pixmapsdir}/icewm
 
-echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm icewm-menu-gnome2 --list \"%{_applnkdir}\"" > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
+echo "menuprog \"Programs\" %{_datadir}/icewm/icons/folder_16x16.xpm wmconfig --output icewm > $RPM_BUILD_ROOT%{_sysconfdir}/X11/%{name}/menu
 
 %find_lang %{name}