From e5889525c4af46ad3cb64304cbfb4a863da189269cb38142691ec4e7ee369c33 Mon Sep 17 00:00:00 2001
From: Philipp Seiler <p.seiler@linuxmail.org>
Date: Wed, 16 Apr 2014 08:57:41 +0000
Subject: [PATCH] Accepting request 229666 from
 home:sfalken:branches:X11:windowmanagers

Added --prefix=/usr and --datadir=/usr/share to %configure to
  correct paths to better match with other WindowManagers in
  openSUSE
- Updated WindowMaker-menu.patch with corrected paths
- Created patch to fix wmgenmenu to remove hardcodes in source
  Add: fix_wmgenmenu_paths.patch

OBS-URL: https://build.opensuse.org/request/show/229666
OBS-URL: https://build.opensuse.org/package/show/X11:windowmanagers/WindowMaker?expand=0&rev=28
---
 WindowMaker-menu.patch    | 799 +++++++++++++++++++-------------------
 WindowMaker.changes       |  10 +
 WindowMaker.spec          |   9 +-
 fix_wmgenmenu_paths.patch |  76 ++++
 4 files changed, 496 insertions(+), 398 deletions(-)
 create mode 100644 fix_wmgenmenu_paths.patch

diff --git a/WindowMaker-menu.patch b/WindowMaker-menu.patch
index b5e7b97..4306659 100644
--- a/WindowMaker-menu.patch
+++ b/WindowMaker-menu.patch
@@ -1,7 +1,6 @@
-Index: WindowMaker/menu
-===================================================================
---- WindowMaker/menu.orig
-+++ WindowMaker/menu
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu WindowMaker-0.95.4/WindowMaker/menu
+--- WindowMaker-0.95.4.old/WindowMaker/menu	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu	2014-04-10 06:40:00.508787124 -0700
 @@ -111,72 +111,18 @@
  	"Info" MENU
  		"Info Panel" INFO_PANEL
@@ -137,10 +136,9 @@ Index: WindowMaker/menu
  "Applications" END
  
  
-Index: WindowMaker/menu.bg
-===================================================================
---- WindowMaker/menu.bg.orig
-+++ WindowMaker/menu.bg
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.bg WindowMaker-0.95.4/WindowMaker/menu.bg
+--- WindowMaker-0.95.4.old/WindowMaker/menu.bg	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.bg	2014-04-10 06:40:00.509787124 -0700
 @@ -115,60 +115,10 @@
  	"Инфо" MENU
  		"Информационен панел..." INFO_PANEL
@@ -220,10 +218,9 @@ Index: WindowMaker/menu.bg
  		"Изход..."  EXIT
  	"Изход" END
  "Приложения" END
-Index: WindowMaker/menu.ca
-===================================================================
---- WindowMaker/menu.ca.orig
-+++ WindowMaker/menu.ca
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ca WindowMaker-0.95.4/WindowMaker/menu.ca
+--- WindowMaker-0.95.4.old/WindowMaker/menu.ca	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.ca	2014-04-10 06:40:00.509787124 -0700
 @@ -110,60 +110,9 @@
          "Informació" MENU
                  "Info Panel..." INFO_PANEL
@@ -302,10 +299,9 @@ Index: WindowMaker/menu.ca
          "Sortir" END
  "Aplicacions" END
  
-Index: WindowMaker/menu.cs
-===================================================================
---- /dev/null
-+++ WindowMaker/menu.cs
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.cs WindowMaker-0.95.4/WindowMaker/menu.cs
+--- WindowMaker-0.95.4.old/WindowMaker/menu.cs	1969-12-31 16:00:00.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.cs	2014-04-10 06:40:00.509787124 -0700
 @@ -0,0 +1,85 @@
 +// Text bellow is in czech, encoding ISO8829-2.
 +//
@@ -392,10 +388,9 @@ Index: WindowMaker/menu.cs
 +		"Ukončit..."  EXIT
 +	 "Konec" END
 +"Hlavní menu" END
-Index: WindowMaker/menu.da
-===================================================================
---- WindowMaker/menu.da.orig
-+++ WindowMaker/menu.da
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.da WindowMaker-0.95.4/WindowMaker/menu.da
+--- WindowMaker-0.95.4.old/WindowMaker/menu.da	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.da	2014-04-10 06:40:00.509787124 -0700
 @@ -103,62 +103,10 @@
          "Info" MENU
                  "Info Panel..." INFO_PANEL
@@ -474,10 +469,9 @@ Index: WindowMaker/menu.da
                  "Afslut..."  EXIT
          "Afslut" END
  "Applikationer" END
-Index: WindowMaker/menu.de
-===================================================================
---- WindowMaker/menu.de.orig
-+++ WindowMaker/menu.de
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.de WindowMaker-0.95.4/WindowMaker/menu.de
+--- WindowMaker-0.95.4.old/WindowMaker/menu.de	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.de	2014-04-10 06:40:00.509787124 -0700
 @@ -44,55 +44,9 @@
  	"Info" MENU
  		"Info Panel..." INFO_PANEL
@@ -556,10 +550,9 @@ Index: WindowMaker/menu.de
 -		"Sitzung beenden..." SHUTDOWN
  	"Beenden" END
  "Anwendungen" END
-Index: WindowMaker/menu.el
-===================================================================
---- WindowMaker/menu.el.orig
-+++ WindowMaker/menu.el
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.el WindowMaker-0.95.4/WindowMaker/menu.el
+--- WindowMaker-0.95.4.old/WindowMaker/menu.el	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.el	2014-04-10 06:40:00.510787124 -0700
 @@ -118,62 +118,10 @@
  	"Πληροφορίες" MENU
  		"Σχετικά..." INFO_PANEL
@@ -640,10 +633,9 @@ Index: WindowMaker/menu.el
  		 "Έξοδος..."  EXIT
  	"Έξοδος" END
  "Μενού" END
-Index: WindowMaker/menu.es
-===================================================================
---- WindowMaker/menu.es.orig
-+++ WindowMaker/menu.es
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.es WindowMaker-0.95.4/WindowMaker/menu.es
+--- WindowMaker-0.95.4.old/WindowMaker/menu.es	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.es	2014-04-10 06:40:00.510787124 -0700
 @@ -43,62 +43,9 @@
  	"Informacion ..." MENU
  		"Copyright..." SHEXEC xmessage -center -font variable -title \
@@ -734,10 +726,9 @@ Index: WindowMaker/menu.es
 -		"Salir de la sesion" SHUTDOWN
  	"Salir ..." END
  "Menu Principal" END
-Index: WindowMaker/menu.fi
-===================================================================
---- WindowMaker/menu.fi.orig
-+++ WindowMaker/menu.fi
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fi WindowMaker-0.95.4/WindowMaker/menu.fi
+--- WindowMaker-0.95.4.old/WindowMaker/menu.fi	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.fi	2014-04-10 06:40:00.510787124 -0700
 @@ -108,61 +108,10 @@
  	"Tietoja" MENU
  		"Tietoja..." INFO_PANEL
@@ -818,10 +809,9 @@ Index: WindowMaker/menu.fi
  		"Lopeta"  EXIT
  	"Lopeta" END
  "Sovellukset" END
-Index: WindowMaker/menu.fr
-===================================================================
---- WindowMaker/menu.fr.orig
-+++ WindowMaker/menu.fr
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.fr WindowMaker-0.95.4/WindowMaker/menu.fr
+--- WindowMaker-0.95.4.old/WindowMaker/menu.fr	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.fr	2014-04-10 06:40:00.510787124 -0700
 @@ -154,61 +154,10 @@
  	"Informations" MENU
  		"Panneau d'informations" INFO_PANEL
@@ -900,10 +890,9 @@ Index: WindowMaker/menu.fr
 -		"Tuer la session..." SHUTDOWN
  	"Quitter" END
  "Applications" END
-Index: WindowMaker/menu.gl
-===================================================================
---- WindowMaker/menu.gl.orig
-+++ WindowMaker/menu.gl
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.gl WindowMaker-0.95.4/WindowMaker/menu.gl
+--- WindowMaker-0.95.4.old/WindowMaker/menu.gl	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.gl	2014-04-10 06:40:00.510787124 -0700
 @@ -45,56 +45,9 @@
  	"Información" MENU
  		"Info Panel..." INFO_PANEL
@@ -980,10 +969,9 @@ Index: WindowMaker/menu.gl
 -		"Sair da sesión..." SHUTDOWN
  	"Sair" END
  "Aplicacións" END
-Index: WindowMaker/menu.he
-===================================================================
---- WindowMaker/menu.he.orig
-+++ WindowMaker/menu.he
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.he WindowMaker-0.95.4/WindowMaker/menu.he
+--- WindowMaker-0.95.4.old/WindowMaker/menu.he	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.he	2014-04-10 06:49:50.406780111 -0700
 @@ -97,60 +97,9 @@
  	"עדימ" MENU
  		"Info Panel..." INFO_PANEL
@@ -1062,10 +1050,9 @@ Index: WindowMaker/menu.he
  	"האיצי" END
  "םימושי" END
  
-Index: WindowMaker/menu.hr
-===================================================================
---- WindowMaker/menu.hr.orig
-+++ WindowMaker/menu.hr
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hr WindowMaker-0.95.4/WindowMaker/menu.hr
+--- WindowMaker-0.95.4.old/WindowMaker/menu.hr	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.hr	2014-04-10 06:40:00.511787124 -0700
 @@ -97,62 +97,9 @@
  	"Informacije" MENU
                  "Info Panel..." INFO_PANEL
@@ -1146,10 +1133,9 @@ Index: WindowMaker/menu.hr
 -		"Izlaz iz sessiona..." SHUTDOWN
  	"Izlaz" END
  "Programi" END
-Index: WindowMaker/menu.hu
-===================================================================
---- WindowMaker/menu.hu.orig
-+++ WindowMaker/menu.hu
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.hu WindowMaker-0.95.4/WindowMaker/menu.hu
+--- WindowMaker-0.95.4.old/WindowMaker/menu.hu	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.hu	2014-04-10 06:40:00.511787124 -0700
 @@ -111,62 +111,10 @@
  	"Infó" MENU
  		"Információs panel..." INFO_PANEL
@@ -1231,10 +1217,9 @@ Index: WindowMaker/menu.hu
  		"Kilépés..."  EXIT
  	"Kilépés" END
  "Alkalmazások" END
-Index: WindowMaker/menu.it
-===================================================================
---- WindowMaker/menu.it.orig
-+++ WindowMaker/menu.it
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.it WindowMaker-0.95.4/WindowMaker/menu.it
+--- WindowMaker-0.95.4.old/WindowMaker/menu.it	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.it	2014-04-10 06:40:00.511787124 -0700
 @@ -45,58 +45,9 @@
  	"Informazioni" MENU
  		"Info Panel..." INFO_PANEL
@@ -1311,10 +1296,9 @@ Index: WindowMaker/menu.it
 -		"Uscire dalla sessione..." SHUTDOWN
  	"Uscire" END
  "Applicazioni" END
-Index: WindowMaker/menu.ja
-===================================================================
---- WindowMaker/menu.ja.orig
-+++ WindowMaker/menu.ja
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ja WindowMaker-0.95.4/WindowMaker/menu.ja
+--- WindowMaker-0.95.4.old/WindowMaker/menu.ja	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.ja	2014-04-10 06:50:56.520779325 -0700
 @@ -103,61 +103,8 @@
  	"情報" MENU
  		"Info パネル..." INFO_PANEL
@@ -1394,10 +1378,9 @@ Index: WindowMaker/menu.ja
  	"終了" END
  "アプリケーション" END
  
-Index: WindowMaker/menu.ko
-===================================================================
---- WindowMaker/menu.ko.orig
-+++ WindowMaker/menu.ko
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ko WindowMaker-0.95.4/WindowMaker/menu.ko
+--- WindowMaker-0.95.4.old/WindowMaker/menu.ko	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.ko	2014-04-10 06:40:00.511787124 -0700
 @@ -102,57 +102,7 @@
  	"정    보" MENU
  		"정보 패널" INFO_PANEL
@@ -1497,10 +1480,9 @@ Index: WindowMaker/menu.ko
 -		"세션종료" SHUTDOWN
  	"종    료" END
  "윈도우메이커" END
-Index: WindowMaker/menu.nl
-===================================================================
---- WindowMaker/menu.nl.orig
-+++ WindowMaker/menu.nl
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.nl WindowMaker-0.95.4/WindowMaker/menu.nl
+--- WindowMaker-0.95.4.old/WindowMaker/menu.nl	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.nl	2014-04-10 06:40:00.512787124 -0700
 @@ -35,48 +35,9 @@
  	"Info" MENU
  		"Info Panel..." INFO_PANEL
@@ -1566,10 +1548,9 @@ Index: WindowMaker/menu.nl
 -		"Afsluiten sessie..." SHUTDOWN
  	"Exit" END
  "Applicaties" END
-Index: WindowMaker/menu.no
-===================================================================
---- WindowMaker/menu.no.orig
-+++ WindowMaker/menu.no
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.no WindowMaker-0.95.4/WindowMaker/menu.no
+--- WindowMaker-0.95.4.old/WindowMaker/menu.no	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.no	2014-04-10 06:40:00.512787124 -0700
 @@ -100,58 +100,9 @@
  	"Info" MENU
  		"Lisens..." INFO_PANEL
@@ -1645,10 +1626,9 @@ Index: WindowMaker/menu.no
 -		"Avslutt X11..." SHUTDOWN
  	"Avslutt" END
  "Applikasjoner" END
-Index: WindowMaker/menu.pl
-===================================================================
---- WindowMaker/menu.pl.orig
-+++ WindowMaker/menu.pl
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pl WindowMaker-0.95.4/WindowMaker/menu.pl
+--- WindowMaker-0.95.4.old/WindowMaker/menu.pl	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.pl	2014-04-10 06:40:00.512787124 -0700
 @@ -104,125 +104,12 @@
  	"Informacja" MENU
  		"Informacja o WMaker..." INFO_PANEL
@@ -1794,10 +1774,9 @@ Index: WindowMaker/menu.pl
 -		"Zabicie sesji..." SHUTDOWN
  	"Wyjście" END
  "WindowMaker" END
-Index: WindowMaker/menu.pt
-===================================================================
---- WindowMaker/menu.pt.orig
-+++ WindowMaker/menu.pt
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.pt WindowMaker-0.95.4/WindowMaker/menu.pt
+--- WindowMaker-0.95.4.old/WindowMaker/menu.pt	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.pt	2014-04-10 06:40:00.512787124 -0700
 @@ -106,61 +106,9 @@
  	"Informações" MENU
  		"Informações..." INFO_PANEL
@@ -1877,10 +1856,9 @@ Index: WindowMaker/menu.pt
  	"Sair" END
  "Aplicações" END
  
-Index: WindowMaker/menu.ro
-===================================================================
---- WindowMaker/menu.ro.orig
-+++ WindowMaker/menu.ro
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ro WindowMaker-0.95.4/WindowMaker/menu.ro
+--- WindowMaker-0.95.4.old/WindowMaker/menu.ro	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.ro	2014-04-10 06:40:00.512787124 -0700
 @@ -108,61 +108,10 @@
  	"Informaţii" MENU
  		"Panou cu Informaţii" INFO_PANEL
@@ -1964,10 +1942,9 @@ Index: WindowMaker/menu.ro
  		"Ieşi"  EXIT
  	"Ieşire" END
  "Aplicaţii" END
-Index: WindowMaker/menu.ru
-===================================================================
---- WindowMaker/menu.ru.orig
-+++ WindowMaker/menu.ru
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.ru WindowMaker-0.95.4/WindowMaker/menu.ru
+--- WindowMaker-0.95.4.old/WindowMaker/menu.ru	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.ru	2014-04-10 06:40:00.513787124 -0700
 @@ -57,70 +57,19 @@
  	"Информация" MENU
  		"Info Panel..." INFO_PANEL
@@ -2056,10 +2033,9 @@ Index: WindowMaker/menu.ru
 -		"Завершить сессию..." SHUTDOWN
  	"Выход" END
  "Приложения" END
-Index: WindowMaker/menu.sk
-===================================================================
---- WindowMaker/menu.sk.orig
-+++ WindowMaker/menu.sk
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sk WindowMaker-0.95.4/WindowMaker/menu.sk
+--- WindowMaker-0.95.4.old/WindowMaker/menu.sk	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.sk	2014-04-10 06:40:00.513787124 -0700
 @@ -122,61 +122,10 @@
  	"Informácie" MENU
  		"Panel Info" INFO_PANEL
@@ -2140,10 +2116,9 @@ Index: WindowMaker/menu.sk
  		"Koniec"  EXIT
  	"Koniec" END
  "Aplikácie" END
-Index: WindowMaker/menu.sl
-===================================================================
---- WindowMaker/menu.sl.orig
-+++ WindowMaker/menu.sl
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.sl WindowMaker-0.95.4/WindowMaker/menu.sl
+--- WindowMaker-0.95.4.old/WindowMaker/menu.sl	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.sl	2014-04-10 06:40:00.513787124 -0700
 @@ -105,61 +105,9 @@
  	"Informacije" MENU
  		"Informacije o programu..." INFO_PANEL
@@ -2222,10 +2197,9 @@ Index: WindowMaker/menu.sl
 -		"Izhod iz session..." SHUTDOWN
  	"Izhod" END
  "Aplikacije" END
-Index: WindowMaker/menu.tr
-===================================================================
---- WindowMaker/menu.tr.orig
-+++ WindowMaker/menu.tr
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.tr WindowMaker-0.95.4/WindowMaker/menu.tr
+--- WindowMaker-0.95.4.old/WindowMaker/menu.tr	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.tr	2014-04-10 06:40:00.513787124 -0700
 @@ -91,61 +91,9 @@
  	"Bilgi" MENU
  		"Copyright..." EXEC xmessage -center -font variable -title \
@@ -2306,10 +2280,246 @@ Index: WindowMaker/menu.tr
  	"Çıkış" END
  "Ana Menü" END
  
-Index: WindowMaker/plmenu.cs
-===================================================================
---- /dev/null
-+++ WindowMaker/plmenu.cs
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/menu.zh_TW WindowMaker-0.95.4/WindowMaker/menu.zh_TW
+--- WindowMaker-0.95.4.old/WindowMaker/menu.zh_TW	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/menu.zh_TW	2014-04-10 06:53:22.923777584 -0700
+@@ -199,7 +199,7 @@
+ 		"背景" END
+ 		"儲存主題" SHEXEC getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/"%a(主題名稱)"
+ 		"儲存圖示集" SHEXEC geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/"%a(圖示集名稱)"
+-		"偏好設定公用程式" EXEC /usr/local/GNUstep/Applications/WPrefs.app/WPrefs
++		"偏好設定公用程式" EXEC /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs
+ 	"外觀" END
+ 
+ 	"離開"	MENU
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu WindowMaker-0.95.4/WindowMaker/plmenu
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu	2014-04-10 06:40:00.517787124 -0700
+@@ -1,106 +1,55 @@
+ ("Applications",
+  ("Info",
+   ("Info Panel", INFO_PANEL),
+-  ("Legal", LEGAL_PANEL),
+-  ("System Console", EXEC, "xconsole"),
+-  ("System Load", SHEXEC, "xosview || xload"),
+-  ("Process List", EXEC, "xterm -e top"),
+-  ("Manual Browser", EXEC, "xman")
+- ),
++  ("Legal", LEGAL_PANEL)
++  ),
+  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
+  ("XTerm", EXEC, "xterm -sb"),
+- ("Mozilla Firefox", EXEC, "firefox"),
+  ("Workspaces", WORKSPACE_MENU),
+- ("Applications",
+-  ("Gimp", SHEXEC, "gimp >/dev/null"),
+-  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
+-  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
+-  ("Abiword", EXEC, "abiword"),
+-  ("Dia", EXEC, "dia"),
+-  ("OpenOffice.org",
+-   ("OpenOffice.org", EXEC, "ooffice"),
+-   ("Writer", EXEC, "oowriter"),
+-   ("Spreadsheet", EXEC, "oocalc"),
+-   ("Draw", EXEC, "oodraw"),
+-   ("Impress", EXEC, "ooimpress")
+-  ),
+-  ("Editors",
+-   ("XEmacs", EXEC, "xemacs"),
+-   ("Emacs", EXEC, "emacs"),
+-   ("XJed", EXEC, "xjed"),
+-   ("VI", EXEC, "xterm -e vi"),
+-   ("GVIM", EXEC, "gvim"),
+-   ("NEdit", EXEC, "nedit"),
+-   ("Xedit", EXEC, "xedit")
+-  ),
+-  ("Multimedia",
+-   ("XMMS",
+-    ("XMMS", EXEC, "xmms"),
+-    ("XMMS play/pause", EXEC, "xmms -t"),
+-    ("XMMS stop", EXEC, "xmms -s")
+-   ),
+-   ("Xine video player", EXEC, "xine"),
+-   ("MPlayer", EXEC, "mplayer")
+-  )
+- ),
+- ("Utils",
+-  ("Calculator", EXEC, "xcalc"),
+-  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+-  ("Font Chooser", EXEC, "xfontsel"),
+-  ("Magnify", EXEC, "wmagnify"),
+-  ("Colormap", EXEC, "xcmap"),
+-  ("Kill X Application", EXEC, "xkill")
+- ),
+- ("Selection",
+-  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
+-  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
+-  ("Navigate", EXEC, "mozilla %s"),
+-  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
+- ),
+  ("Commands",
+   ("Hide Others", HIDE_OTHERS),
+   ("Show All", SHOW_ALL),
+   ("Arrange Icons", ARRANGE_ICONS),
+   ("Refresh", REFRESH),
+-  ("Lock", EXEC, "xlock -allowroot -usefirst")
+- ),
++  ("Lock", EXEC, "xlock -allowroot -usefirst"),
++  ("Save Session", SAVE_SESSION),
++  ("Clear Session", CLEAR_SESSION)
++  ),
+  ("Appearance",
+   ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+   ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+   ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+   ("Background",
+    ("Solid",
+-	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+-	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
+-	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
+-	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
+-	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
+-	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
+-	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
+-	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
++    ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
++    ("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
++    ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
++    ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
++    ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
++    ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
++    ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
++    ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
+    ),
+    ("Gradient",
+-	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
+-	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
+-	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
+-	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
+-	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
+-	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
+-	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+-	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
++    ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
++    ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
++    ("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
++    ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
++    ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
++    ("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
++    ("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
++    ("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+    ),
+    ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+    ),
+-   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+-   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+-   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+-   ),
+-   ("Session",
+-    ("Save Session", SAVE_SESSION),
+-    ("Clear Session", CLEAR_SESSION),
+-	("Restart Window Maker", RESTART),
+-	("Start BlackBox", RESTART, blackbox),
+-	("Start IceWM", RESTART, icewm),
+-	("Exit", EXIT)
+-   )
++  ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
++  ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
++  ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
++  ),
++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
++ ("Exit",
++  ("Restart", RESTART),
++  ("Exit", EXIT)
++ )
+ )
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.bg WindowMaker-0.95.4/WindowMaker/plmenu.bg
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.bg	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.bg	2014-04-10 06:40:00.518787124 -0700
+@@ -1,61 +1,10 @@
+ ("Приложения",
+  ("Инфо",
+-  ("Информационен панел...", INFO_PANEL),
+-  ("Лицензионен панел...", LEGAL_PANEL),
+-  ("Системна конзола", EXEC, "xconsole"),
+-  ("Натоварване на системата", SHEXEC, "xosview || xload"),
+-  ("Списък на процесите", EXEC, "xterm -e top"),
+-  ("Ръководства", EXEC, "xman")
++  ("Лицензионен панел...", LEGAL_PANEL)
+   ),
+  ("Стартирай...", SHEXEC, "%a(Run,Въведете команда, която да се стартира:)"),
+  ("XTerm", EXEC, "xterm -sb"),
+- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
+  ("Работни места", WORKSPACE_MENU),
+- ("Приложения",
+-  ("Графични",
+-   ("Gimp", SHEXEC, "gimp >/dev/null"),
+-   ("XV", EXEC, "xv"),
+-   ("XPaint", EXEC, "xpaint"),
+-   ("XFig", EXEC, "xfig")
+-   ),
+-  ("X File Manager", EXEC, "xfm"),
+-  ("OffiX Files", EXEC, "files"),
+-  ("LyX", EXEC, "lyx"),
+-  ("Netscape", EXEC, "netscape"),
+-  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
+-  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
+-  ("TkDesk", EXEC, "tkdesk")
+-  ),
+- ("Редактори",
+-  ("XFte", EXEC, "xfte"),
+-  ("XEmacs", SHEXEC, "xemacs || emacs"),
+-  ("XJed", EXEC, "xjed"),
+-  ("NEdit", EXEC, "nedit"),
+-  ("Xedit", EXEC, "xedit"),
+-  ("VI", EXEC, "xterm -e vi")
+-  ),
+- ("Разни",
+-  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
+-  ("Xplaycd", EXEC, "xplaycd"),
+-  ("Xmixer", EXEC, "xmixer")
+-  ),
+- ("Инструменти",
+-  ("Калкулатор", EXEC, "xcalc"),
+-  ("Свойства на прозореца", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
+-  ("Избор на шрифт", EXEC, "xfontsel"),
+-  ("Емулатор на терминал", EXEC, "xminicom"),
+-  ("Лупа", EXEC, "xmag"),
+-  ("Цветна палитра", EXEC, "xcmap"),
+-  ("XKill", EXEC, "xkill"),
+-  ("ASClock", EXEC, "asclock -shape"),
+-  ("Clipboard", EXEC, "xclipboard")
+-  ),
+- ("Избор",
+-  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
+-  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
+-  ("Navigate", EXEC, "netscape %s"),
+-  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
+-  ),
+  ("Работно място",
+   ("Скрий другите", HIDE_OTHERS),
+   ("Покажи всички", SHOW_ALL),
+@@ -94,13 +43,12 @@
+    ),
+   ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
+   ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
+-  ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
++  ("Пособие за настройки", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
+   ),
++ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
++ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
+  ("Изход",
+   ("Рестартиране", RESTART),
+-  ("Стартирай BlackBox", RESTART, blackbox),
+-  ("Стартирай kwm", RESTART, kwm),
+-  ("Стартирай IceWM", RESTART, icewm),
+   ("Изход...", EXIT)
+  )
+ )
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.cs WindowMaker-0.95.4/WindowMaker/plmenu.cs
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.cs	1969-12-31 16:00:00.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.cs	2014-04-10 06:40:00.513787124 -0700
 @@ -0,0 +1,158 @@
 +(
 +"Hlavní menu",
@@ -2469,10 +2679,9 @@ Index: WindowMaker/plmenu.cs
 +		("Ukončit...", EXIT)
 +	 )
 +)
-Index: WindowMaker/plmenu.da
-===================================================================
---- WindowMaker/plmenu.da.orig
-+++ WindowMaker/plmenu.da
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.da WindowMaker-0.95.4/WindowMaker/plmenu.da
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.da	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.da	2014-04-10 06:40:00.514787124 -0700
 @@ -3,23 +3,7 @@
          (
          "Info",
@@ -2716,10 +2925,9 @@ Index: WindowMaker/plmenu.da
                  ("Afslut...", EXIT)
          )
  )
-Index: WindowMaker/plmenu.de
-===================================================================
---- WindowMaker/plmenu.de.orig
-+++ WindowMaker/plmenu.de
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.de WindowMaker-0.95.4/WindowMaker/plmenu.de
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.de	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.de	2014-04-10 06:42:15.996785513 -0700
 @@ -1,61 +1,11 @@
  ("Anwendungen",
   ("Info",
@@ -2783,7 +2991,25 @@ Index: WindowMaker/plmenu.de
   ("Arbeitsfläche",
    ("Andere verbergen", HIDE_OTHERS),
    ("Alle zeigen", SHOW_ALL),
-@@ -94,12 +44,12 @@
+@@ -66,9 +16,9 @@
+   ("Gespeicherte Sitzung löschen", CLEAR_SESSION)
+   ),
+  ("Erscheinungsbild",
+-  ("Themen", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Themes $(HOME)/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+-  ("Stile", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Styles $(HOME)/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+-  ("Iconsätze", OPEN_MENU, "-noext /usr/local/share/WindowMaker/IconSets $(HOME)/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
++  ("Themen", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes $(HOME)/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
++  ("Stile", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles $(HOME)/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
++  ("Iconsätze", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets $(HOME)/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+   ("Hintergrund",
+    ("Einfarbig",
+     ("Schwarz", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+@@ -90,16 +40,16 @@
+     ("Grau schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+     ("Weinfarben schattiert",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+     ),
+-   ("Bilder", OPEN_MENU, "-noext /usr/local/share/WindowMaker/Backgrounds $(HOME)/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
++   ("Bilder", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds $(HOME)/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
     ),   
    ("Thema speichern", SHEXEC, "getstyle -t $(HOME)/GNUstep/Library/WindowMaker/Themes/\"%a(Themenname)\""),
    ("Iconsatz speichern", SHEXEC, "geticonset $(HOME)/GNUstep/Library/WindowMaker/IconSets/\"%a(Iconsatz-Name)\"")
@@ -2800,10 +3026,9 @@ Index: WindowMaker/plmenu.de
    ("Beenden...", EXIT)
   )
  )
-Index: WindowMaker/plmenu.es
-===================================================================
---- WindowMaker/plmenu.es.orig
-+++ WindowMaker/plmenu.es
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.es WindowMaker-0.95.4/WindowMaker/plmenu.es
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.es	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.es	2014-04-10 06:40:00.514787124 -0700
 @@ -1,61 +1,10 @@
  ("Aplicaciones",
   ("Informacion",
@@ -2902,10 +3127,9 @@ Index: WindowMaker/plmenu.es
    ("Salir", EXIT)
   )
  )
-Index: WindowMaker/plmenu.fi
-===================================================================
---- WindowMaker/plmenu.fi.orig
-+++ WindowMaker/plmenu.fi
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fi WindowMaker-0.95.4/WindowMaker/plmenu.fi
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.fi	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.fi	2014-04-10 06:40:00.514787124 -0700
 @@ -3,27 +3,7 @@
  	(
  	"Tietoja",
@@ -3176,10 +3400,9 @@ Index: WindowMaker/plmenu.fi
  		("Lopeta", EXIT)
  	)
  )
-Index: WindowMaker/plmenu.fr
-===================================================================
---- WindowMaker/plmenu.fr.orig
-+++ WindowMaker/plmenu.fr
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.fr WindowMaker-0.95.4/WindowMaker/plmenu.fr
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.fr	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.fr	2014-04-10 06:43:34.349784582 -0700
 @@ -1,61 +1,11 @@
  ("Applications",
    ("Informations",
@@ -3243,8 +3466,25 @@ Index: WindowMaker/plmenu.fr
   ("Bureaux",
     ("Cacher les autres fenêtres", HIDE_OTHERS),
     ("Montrer toutes les fenêtres", SHOW_ALL),
-@@ -91,12 +41,13 @@
-      ("Images", OPEN_MENU, "-noext /opt/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
+@@ -66,9 +16,9 @@
+    ("Effacer la session", CLEAR_SESSION)
+   ),
+  ("Apparence",
+-   ("Thèmes", OPEN_MENU, "-noext /opt/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
+-   ("Styles", OPEN_MENU, "-noext /opt/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
+-   ("Jeu d'icônes", OPEN_MENU, "-noext /opt/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
++   ("Thèmes", OPEN_MENU, "-noext /usr/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
++   ("Styles", OPEN_MENU, "-noext /usr/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
++   ("Jeu d'icônes", OPEN_MENU, "-noext /usr/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
+    ("Fond d'écran",
+      ("Unifié",
+        ("Noir", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
+@@ -88,15 +38,16 @@
+        ("Dégradés de Gris",    EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
+        ("Dégradés de Bordeau", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
+       ),
+-     ("Images", OPEN_MENU, "-noext /opt/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
++     ("Images", OPEN_MENU, "-noext /usr/share/WindowMaker/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
        ),
     ("Sauver le thème", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes /\"%a(Nom du thème,Entrez un nom de fichier:)\""),
 -   ("Sauver le jeu d'icônes", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets /\"%a(Nom du jeu d'icônes,Entrez un nom de fichier:)\"")  
@@ -3261,10 +3501,9 @@ Index: WindowMaker/plmenu.fr
 +   ("Quitter...", EXIT)
    )
  )
-Index: WindowMaker/plmenu.hr
-===================================================================
---- WindowMaker/plmenu.hr.orig
-+++ WindowMaker/plmenu.hr
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.hr WindowMaker-0.95.4/WindowMaker/plmenu.hr
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.hr	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.hr	2014-04-10 06:43:50.233784393 -0700
 @@ -3,77 +3,12 @@
    (
      Info,
@@ -3405,10 +3644,9 @@ Index: WindowMaker/plmenu.hr
 +    (Izlaz..., EXIT)
    )
  )
-Index: WindowMaker/plmenu.it
-===================================================================
---- WindowMaker/plmenu.it.orig
-+++ WindowMaker/plmenu.it
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.it WindowMaker-0.95.4/WindowMaker/plmenu.it
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.it	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.it	2014-04-10 06:44:06.579784199 -0700
 @@ -1,61 +1,11 @@
  ("Applicazioni",
   ("Informazioni",
@@ -3509,10 +3747,9 @@ Index: WindowMaker/plmenu.it
 -  ("Uccidi sessione...", SHUTDOWN)
   )
  )
-Index: WindowMaker/plmenu.ja
-===================================================================
---- WindowMaker/plmenu.ja.orig
-+++ WindowMaker/plmenu.ja
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ja WindowMaker-0.95.4/WindowMaker/plmenu.ja
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ja	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.ja	2014-04-10 06:44:22.655784007 -0700
 @@ -1,44 +1,10 @@
  ("アプリケーション",
   ("情報",
@@ -3590,10 +3827,9 @@ Index: WindowMaker/plmenu.ja
    ("終了", EXIT)
   )
  )
-Index: WindowMaker/plmenu.ko
-===================================================================
---- WindowMaker/plmenu.ko.orig
-+++ WindowMaker/plmenu.ko
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ko WindowMaker-0.95.4/WindowMaker/plmenu.ko
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ko	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.ko	2014-04-10 06:40:00.515787124 -0700
 @@ -1,57 +1,7 @@
  ("윈도우메이커",
   ("정    보",
@@ -3691,10 +3927,9 @@ Index: WindowMaker/plmenu.ko
 +  ("종    료", EXIT)
   )
  )
-Index: WindowMaker/plmenu.pl
-===================================================================
---- WindowMaker/plmenu.pl.orig
-+++ WindowMaker/plmenu.pl
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.pl WindowMaker-0.95.4/WindowMaker/plmenu.pl
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.pl	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.pl	2014-04-10 06:40:00.515787124 -0700
 @@ -1,125 +1,12 @@
  ("WindowMaker",
  	("Informacja",
@@ -3844,10 +4079,9 @@ Index: WindowMaker/plmenu.pl
 +		("Wyjście...",       EXIT)
  	)
  )
-Index: WindowMaker/plmenu.ro
-===================================================================
---- WindowMaker/plmenu.ro.orig
-+++ WindowMaker/plmenu.ro
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.ro WindowMaker-0.95.4/WindowMaker/plmenu.ro
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.ro	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.ro	2014-04-10 06:40:00.516787124 -0700
 @@ -1,61 +1,11 @@
  ("Aplicaţii",
   ("Informaţii",
@@ -3928,10 +4162,9 @@ Index: WindowMaker/plmenu.ro
    ("Ieşi", EXIT)
   )
  )
-Index: WindowMaker/plmenu.sk
-===================================================================
---- WindowMaker/plmenu.sk.orig
-+++ WindowMaker/plmenu.sk
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.sk WindowMaker-0.95.4/WindowMaker/plmenu.sk
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.sk	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.sk	2014-04-10 06:40:00.516787124 -0700
 @@ -1,61 +1,11 @@
  ("Aplikácie",
   ("Info",
@@ -4012,10 +4245,9 @@ Index: WindowMaker/plmenu.sk
    ("Koniec", EXIT)
   )
  )
-Index: WindowMaker/plmenu.zh_CN
-===================================================================
---- WindowMaker/plmenu.zh_CN.orig
-+++ WindowMaker/plmenu.zh_CN
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_CN WindowMaker-0.95.4/WindowMaker/plmenu.zh_CN
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_CN	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.zh_CN	2014-04-10 06:46:13.072782695 -0700
 @@ -1,63 +1,11 @@
  ("应用程序",
   ("信息",
@@ -4100,10 +4332,9 @@ Index: WindowMaker/plmenu.zh_CN
    ("退出...", EXIT)
   )
  )
-Index: WindowMaker/plmenu.zh_TW
-===================================================================
---- WindowMaker/plmenu.zh_TW.orig
-+++ WindowMaker/plmenu.zh_TW
+diff -rupN WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_TW WindowMaker-0.95.4/WindowMaker/plmenu.zh_TW
+--- WindowMaker-0.95.4.old/WindowMaker/plmenu.zh_TW	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/WindowMaker/plmenu.zh_TW	2014-04-10 06:46:46.022782303 -0700
 @@ -1,59 +1,11 @@
  ("應用程式",
   ("資訊",
@@ -4166,9 +4397,12 @@ Index: WindowMaker/plmenu.zh_TW
   ("工作區",
    ("隱藏其他", HIDE_OTHERS),
    ("全部顯示", SHOW_ALL),
-@@ -94,11 +46,10 @@
+@@ -92,13 +44,12 @@
+    ),
+   ("儲存主題", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/%a(主題名稱)"),
    ("儲存圖示集", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/%a(圖示集名稱)"),
-   ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
+-  ("偏好設定公用程式", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
++  ("偏好設定公用程式", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
    ),
 +  ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
 +  ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
@@ -4180,230 +4414,3 @@ Index: WindowMaker/plmenu.zh_TW
    ("離開...", EXIT)
   )
  )
-Index: WindowMaker/plmenu
-===================================================================
---- WindowMaker/plmenu.orig
-+++ WindowMaker/plmenu
-@@ -1,106 +1,55 @@
- ("Applications",
-  ("Info",
-   ("Info Panel", INFO_PANEL),
--  ("Legal", LEGAL_PANEL),
--  ("System Console", EXEC, "xconsole"),
--  ("System Load", SHEXEC, "xosview || xload"),
--  ("Process List", EXEC, "xterm -e top"),
--  ("Manual Browser", EXEC, "xman")
-- ),
-+  ("Legal", LEGAL_PANEL)
-+  ),
-  ("Run...", SHEXEC, "%a(Run,Type command to run:)"),
-  ("XTerm", EXEC, "xterm -sb"),
-- ("Mozilla Firefox", EXEC, "firefox"),
-  ("Workspaces", WORKSPACE_MENU),
-- ("Applications",
--  ("Gimp", SHEXEC, "gimp >/dev/null"),
--  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Xpdf", EXEC, "xpdf %a(Enter PDF to view)"),
--  ("Abiword", EXEC, "abiword"),
--  ("Dia", EXEC, "dia"),
--  ("OpenOffice.org",
--   ("OpenOffice.org", EXEC, "ooffice"),
--   ("Writer", EXEC, "oowriter"),
--   ("Spreadsheet", EXEC, "oocalc"),
--   ("Draw", EXEC, "oodraw"),
--   ("Impress", EXEC, "ooimpress")
--  ),
--  ("Editors",
--   ("XEmacs", EXEC, "xemacs"),
--   ("Emacs", EXEC, "emacs"),
--   ("XJed", EXEC, "xjed"),
--   ("VI", EXEC, "xterm -e vi"),
--   ("GVIM", EXEC, "gvim"),
--   ("NEdit", EXEC, "nedit"),
--   ("Xedit", EXEC, "xedit")
--  ),
--  ("Multimedia",
--   ("XMMS",
--    ("XMMS", EXEC, "xmms"),
--    ("XMMS play/pause", EXEC, "xmms -t"),
--    ("XMMS stop", EXEC, "xmms -s")
--   ),
--   ("Xine video player", EXEC, "xine"),
--   ("MPlayer", EXEC, "mplayer")
--  )
-- ),
-- ("Utils",
--  ("Calculator", EXEC, "xcalc"),
--  ("Window Properties", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
--  ("Font Chooser", EXEC, "xfontsel"),
--  ("Magnify", EXEC, "wmagnify"),
--  ("Colormap", EXEC, "xcmap"),
--  ("Kill X Application", EXEC, "xkill")
-- ),
-- ("Selection",
--  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
--  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
--  ("Navigate", EXEC, "mozilla %s"),
--  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
-- ),
-  ("Commands",
-   ("Hide Others", HIDE_OTHERS),
-   ("Show All", SHOW_ALL),
-   ("Arrange Icons", ARRANGE_ICONS),
-   ("Refresh", REFRESH),
--  ("Lock", EXEC, "xlock -allowroot -usefirst")
-- ),
-+  ("Lock", EXEC, "xlock -allowroot -usefirst"),
-+  ("Save Session", SAVE_SESSION),
-+  ("Clear Session", CLEAR_SESSION)
-+  ),
-  ("Appearance",
-   ("Themes", OPEN_MENU, "-noext #wmdatadir#/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
-   ("Styles", OPEN_MENU, "-noext #wmdatadir#/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
-   ("Icon Sets", OPEN_MENU, "-noext #wmdatadir#/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
-   ("Background",
-    ("Solid",
--	("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
--	("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
--	("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
--	("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
--	("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
--	("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
--	("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
--	("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-+    ("Black", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, black)'"),
-+    ("Blue",  EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#505075\")'"),
-+    ("Indigo", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#243e6c\")'"),
-+    ("Bluemarine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#224477\")'"),
-+    ("Purple", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#554466\")'"),
-+    ("Wheat", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, wheat4)'"),
-+    ("Dark Gray", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#333340\")'"),
-+    ("Wine", EXEC, "wdwrite WindowMaker WorkspaceBack '(solid, \"#400020\")'")
-    ),
-    ("Gradient",
--	("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
--	("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
--	("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
--	("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
--	("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
--	("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
--	("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
--	("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-+    ("Sunset", EXEC, "wdwrite WindowMaker WorkspaceBack '(mvgradient, deepskyblue4, black, deepskyblue4, tomato4)'"),
-+    ("Sky", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, blue4, white)'"),
-+    ("Blue Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#7080a5\", \"#101020\")'"),
-+    ("Indigo Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#746ebc\", \"#242e4c\")'"),
-+    ("Purple Shades", EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#654c66\", \"#151426\")'"),
-+    ("Wheat Shades",  EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#a09060\", \"#302010\")'"),
-+    ("Grey Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#636380\", \"#131318\")'"),
-+    ("Wine Shades",   EXEC, "wdwrite WindowMaker WorkspaceBack '(vgradient, \"#600040\", \"#180010\")'")
-    ),
-    ("Images", OPEN_MENU, "-noext #wmdatadir#/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t")
-    ),
--   ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
--   ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--   ("Preferences Utility", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
--   ),
--   ("Session",
--    ("Save Session", SAVE_SESSION),
--    ("Clear Session", CLEAR_SESSION),
--	("Restart Window Maker", RESTART),
--	("Start BlackBox", RESTART, blackbox),
--	("Start IceWM", RESTART, icewm),
--	("Exit", EXIT)
--   )
-+  ("Save Theme", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-+  ("Save IconSet", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
-+  ("Preferences Utility", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ),
-+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
-+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
-+ ("Exit",
-+  ("Restart", RESTART),
-+  ("Exit", EXIT)
-+ )
- )
-Index: WindowMaker/plmenu.bg
-===================================================================
---- WindowMaker/plmenu.bg.orig
-+++ WindowMaker/plmenu.bg
-@@ -1,61 +1,10 @@
- ("Приложения",
-  ("Инфо",
--  ("Информационен панел...", INFO_PANEL),
--  ("Лицензионен панел...", LEGAL_PANEL),
--  ("Системна конзола", EXEC, "xconsole"),
--  ("Натоварване на системата", SHEXEC, "xosview || xload"),
--  ("Списък на процесите", EXEC, "xterm -e top"),
--  ("Ръководства", EXEC, "xman")
-+  ("Лицензионен панел...", LEGAL_PANEL)
-   ),
-  ("Стартирай...", SHEXEC, "%a(Run,Въведете команда, която да се стартира:)"),
-  ("XTerm", EXEC, "xterm -sb"),
-- ("Rxvt", EXEC, "rxvt -bg black -fg white -fn fixed"),
-  ("Работни места", WORKSPACE_MENU),
-- ("Приложения",
--  ("Графични",
--   ("Gimp", SHEXEC, "gimp >/dev/null"),
--   ("XV", EXEC, "xv"),
--   ("XPaint", EXEC, "xpaint"),
--   ("XFig", EXEC, "xfig")
--   ),
--  ("X File Manager", EXEC, "xfm"),
--  ("OffiX Files", EXEC, "files"),
--  ("LyX", EXEC, "lyx"),
--  ("Netscape", EXEC, "netscape"),
--  ("Ghostview", EXEC, "ghostview %a(Enter file to view)"),
--  ("Acrobat", EXEC, "/usr/local/Acrobat3/bin/acroread %a(Enter PDF to view)"),
--  ("TkDesk", EXEC, "tkdesk")
--  ),
-- ("Редактори",
--  ("XFte", EXEC, "xfte"),
--  ("XEmacs", SHEXEC, "xemacs || emacs"),
--  ("XJed", EXEC, "xjed"),
--  ("NEdit", EXEC, "nedit"),
--  ("Xedit", EXEC, "xedit"),
--  ("VI", EXEC, "xterm -e vi")
--  ),
-- ("Разни",
--  ("Xmcd", SHEXEC, "xmcd 2> /dev/null"),
--  ("Xplaycd", EXEC, "xplaycd"),
--  ("Xmixer", EXEC, "xmixer")
--  ),
-- ("Инструменти",
--  ("Калкулатор", EXEC, "xcalc"),
--  ("Свойства на прозореца", SHEXEC, "xprop | xmessage -center -title 'xprop' -file -"),
--  ("Избор на шрифт", EXEC, "xfontsel"),
--  ("Емулатор на терминал", EXEC, "xminicom"),
--  ("Лупа", EXEC, "xmag"),
--  ("Цветна палитра", EXEC, "xcmap"),
--  ("XKill", EXEC, "xkill"),
--  ("ASClock", EXEC, "asclock -shape"),
--  ("Clipboard", EXEC, "xclipboard")
--  ),
-- ("Избор",
--  ("Copy", SHEXEC, "echo '%s' | wxcopy"),
--  ("Mail To", EXEC, "xterm -name mail -T Pine -e pine %s"),
--  ("Navigate", EXEC, "netscape %s"),
--  ("Search in Manual", EXEC, "MANUAL_SEARCH(%s)")
--  ),
-  ("Работно място",
-   ("Скрий другите", HIDE_OTHERS),
-   ("Покажи всички", SHOW_ALL),
-@@ -94,13 +43,12 @@
-    ),
-   ("Запази темата", SHEXEC, "getstyle -t $HOME/GNUstep/Library/WindowMaker/Themes/\"%a(Theme name)\""),
-   ("Запази колекцията иконки", SHEXEC, "geticonset $HOME/GNUstep/Library/WindowMaker/IconSets/\"%a(IconSet name)\""),
--  ("Пособие за настройки", EXEC, "/usr/local/GNUstep/Applications/WPrefs.app/WPrefs")
-+  ("Пособие за настройки", EXEC, "/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs")
-   ),
-+ ("WindowMaker", OPEN_MENU, "/etc/X11/WindowMaker/SuSE_wmapps"),
-+ ("SuSE", OPEN_MENU, "| xdg_menu --format WindowMaker --charset UTF-8"),
-  ("Изход",
-   ("Рестартиране", RESTART),
--  ("Стартирай BlackBox", RESTART, blackbox),
--  ("Стартирай kwm", RESTART, kwm),
--  ("Стартирай IceWM", RESTART, icewm),
-   ("Изход...", EXIT)
-  )
- )
diff --git a/WindowMaker.changes b/WindowMaker.changes
index 4c80417..12e4c55 100644
--- a/WindowMaker.changes
+++ b/WindowMaker.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Apr 10 20:57:27 UTC 2014 - sfalken@opensuse.org
+
+- Added --prefix=/usr and --datadir=/usr/share to %configure to
+  correct paths to better match with other WindowManagers in
+  openSUSE
+- Updated WindowMaker-menu.patch with corrected paths
+- Created patch to fix wmgenmenu to remove hardcodes in source
+  Add: fix_wmgenmenu_paths.patch 
+
 -------------------------------------------------------------------
 Sat Sep 14 09:58:39 UTC 2013 - chris@computersalat.de
 
diff --git a/WindowMaker.spec b/WindowMaker.spec
index 2a7a0c8..aa547c3 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package WindowMaker
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -35,6 +35,7 @@ Source6:        windowmaker
 Source7:        %{name}-rpmlintrc
 Patch1:         %{name}-config.patch
 Patch2:         %{name}-menu.patch
+Patch3:         fix_wmgenmenu_paths.patch
 #
 Patch101:       wm-giflib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -93,7 +94,8 @@ developing applications which use WindowMaker.
 mkdir menu_orig
 cp %{name}/{menu.*,plmenu.*} menu_orig
 %patch1
-%patch2
+%patch2 -p1
+%patch3 -p1
 %patch101
 cp %{S:4} .
 cp %{S:6} .
@@ -113,6 +115,8 @@ export LINGUAS="be bg bs ca cs da de el es et fi fr gl hr hu hy it ja ko ms nl n
 %endif
 export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
 %configure \
+  --prefix=/usr \
+  --datadir=/usr/share \
   --disable-static \
   --with-pic\
   --sysconfdir=/etc/X11 \
@@ -125,6 +129,7 @@ export CFLAGS="$RPM_OPT_FLAGS $(freetype-config --cflags)"
 make %{?_smp_mflags}
 (cd %{name}-extra-0.1
 %configure \
+  --prefix=/usr \
   --disable-static \
   --with-pic\
   --with-pixmapdir=/usr/share/%{name}/Pixmaps
diff --git a/fix_wmgenmenu_paths.patch b/fix_wmgenmenu_paths.patch
new file mode 100644
index 0000000..ec7827a
--- /dev/null
+++ b/fix_wmgenmenu_paths.patch
@@ -0,0 +1,76 @@
+From 3981805ec78adf4479f0988cfc2174a02d58a738 Mon Sep 17 00:00:00 2001
+From: "Carlos R. Mafra" <crmafra@gmail.com>
+Date: Thu, 10 Apr 2014 19:34:48 +0100
+Subject: [PATCH] wmgenmenu: Write paths according to options set at configure
+ time
+
+As reported by Shawn W Dunn, the configuration strings written by wmgenmenu
+in $HOME/GNUstep/Defaults/WMRootMenu were not reflecting his installation
+directories choices.
+
+Fix this by writing strings composed with PKGDATADIR.
+
+Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
+---
+diff -rupN WindowMaker-0.95.4.old/util/wmgenmenu.c WindowMaker-0.95.4/util/wmgenmenu.c
+--- WindowMaker-0.95.4.old/util/wmgenmenu.c	2013-01-09 13:42:39.000000000 -0800
++++ WindowMaker-0.95.4/util/wmgenmenu.c	2014-04-10 13:02:00.693514632 -0700
+@@ -35,6 +35,13 @@ int main(int argc, char *argv[])
+ {
+ 	char *t;
+ 	int ch;
++	char *tmp, *theme_paths, *style_paths, *icon_paths, *bg_paths;
++
++	tmp = wstrconcat("-noext ", PKGDATADIR);
++	theme_paths = wstrconcat(tmp, "/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle");
++	style_paths = wstrconcat(tmp, "/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle");
++	icon_paths = wstrconcat(tmp, "/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons");
++	bg_paths = wstrconcat(tmp, "/Backgrounds $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t");
+ 
+ 	struct option longopts[] = {
+ 		{ "version",		no_argument,	NULL,	'v' },
+@@ -146,7 +153,7 @@ int main(int argc, char *argv[])
+ 	L2Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Themes")),
+ 		WMCreatePLString("OPEN_MENU"),
+-		WMCreatePLString("-noext /usr/local/share/WindowMaker/Themes $HOME/GNUstep/Library/WindowMaker/Themes WITH setstyle"),
++		WMCreatePLString(theme_paths),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(L1Menu, L2Menu);
+@@ -155,7 +162,7 @@ int main(int argc, char *argv[])
+ 	L2Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Styles")),
+ 		WMCreatePLString("OPEN_MENU"),
+-		WMCreatePLString("-noext /usr/local/share/WindowMaker/Styles $HOME/GNUstep/Library/WindowMaker/Styles WITH setstyle"),
++		WMCreatePLString(style_paths),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(L1Menu, L2Menu);
+@@ -164,7 +171,7 @@ int main(int argc, char *argv[])
+ 	L2Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Icon Sets")),
+ 		WMCreatePLString("OPEN_MENU"),
+-		WMCreatePLString("-noext /usr/local/share/WindowMaker/IconSets $HOME/GNUstep/Library/WindowMaker/IconSets WITH seticons"),
++		WMCreatePLString(icon_paths),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(L1Menu, L2Menu);
+@@ -232,7 +239,7 @@ int main(int argc, char *argv[])
+ 	L3Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Images")),
+ 		WMCreatePLString("OPEN_MENU"),
+-		WMCreatePLString("-noext $HOME/GNUstep/Library/WindowMaker/Backgrounds WITH wmsetbg -u -t"),
++		WMCreatePLString(bg_paths),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(L2Menu, L3Menu);
+@@ -321,7 +328,7 @@ int main(int argc, char *argv[])
+ 	L1Menu = WMCreatePLArray(
+ 		WMCreatePLString(_("Configure Window Maker")),
+ 		WMCreatePLString("EXEC"),
+-		WMCreatePLString("WPrefs"),
++		WMCreatePLString("/usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"),
+ 		NULL
+ 	);
+ 	WMAddToPLArray(RMenu, L1Menu);