- rel 2

- menu hack for 1.2.2

Changed files:
    icewm-menu.patch -> 1.3
    icewm.spec -> 1.99

diff --git a/icewm-menu.patch b/icewm-menu.patch
new file mode 100644 (file)
index 0000000..32838a7
--- /dev/null
+++ b/icewm-menu.patch
@@ -0,0 +1,14 @@
+diff -ruN icewm-1.2.2_/src/wmprog.cc icewm-1.2.2/src/wmprog.cc
+--- icewm-1.2.2_/src/wmprog.cc Fri Sep  6 19:18:07 2002
++++ icewm-1.2.2/src/wmprog.cc  Sat Sep 28 18:15:04 2002
+@@ -586,7 +586,9 @@
+         YIcon *gnomeIcon = 0;
+         YIcon *kdeIcon = 0;
+ 
+-        char *gnomeAppsMenu = gnome_datadir_file("gnome/apps/");
++// kde menu don't seem to work
++//        char *gnomeAppsMenu = gnome_datadir_file("gnome/apps/");
++        char *gnomeAppsMenu = gnome_datadir_file("applnk");
+         char *gnomeUserMenu = gnome_util_home_file("apps/");
+         const char *kdeMenu = strJoin(kdeDataDir, "/applnk", 0);
+ 

diff --git a/icewm.spec b/icewm.spec
index 76de3bddb2701c90dc791f54235e5b15f8e7e5c4..a9d7dc7250c7796d71cc3479e6e91ec3980116c8 100644 (file)
--- a/icewm.spec
+++ b/icewm.spec
@@ -19,7 +19,7 @@ Summary(ru):  
 Summary(uk):   ÷¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          icewm
 Version:       1.2.2
-Release:       1
+Release:       2
 Epoch:         1
 License:       LGPL
 Group:         X11/Window Managers
@@ -31,6 +31,7 @@ Source4:      IceWM.RunWM
 Source5:       IceWM.wm_style
 Source6:       %{name}-menu
 Source7:       http://prdownloads.sourceforge.net/icewm/netscapeicons-0.2.tar.gz
+Patch0:                %{name}-menu.patch
 URL:           http://www.icewm.org/
 BuildRequires: XFree86-devel
 %{!?_without_guievents:BuildRequires:  esound-devel}
@@ -105,6 +106,7 @@ warp3, warp4, win95.
 
 %prep
 %setup -q
+%patch0 -p1
 
 cd lib/icons
 tar -xzf %{SOURCE3}