- fixed vfmg patch, updated plmenu patch

[packages/WindowMaker.git] / WindowMaker.spec

diff --git a/WindowMaker.spec b/WindowMaker.spec
index b7ed5e32ddf1525431dbd733e745d71f7db34dd2..4edd25902ac2fabf69a5007c5d333f5c57c84b99 100644 (file)
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -10,7 +10,7 @@ Summary(ru):  WindowMaker - 
 Summary(uk):   WindowMaker - צËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ ÄÌÑ X11
 Name:          WindowMaker
 Version:       0.81.0
-Release:       0.%{_snap}.4
+Release:       0.%{_snap}.8
 License:       GPL
 Group:         X11/Window Managers
 Source0:       ftp://ftp.windowmaker.org/pub/source/snapshots/%{name}-CVS-%{_snap}.tar.gz
@@ -24,7 +24,7 @@ Source4:      %{name}.RunWM
 Source5:       %{name}.wm_style
 Source6:       %{name}-xsession.desktop
 Patch0:                %{name}-CFLAGS.patch
-Patch1:                %{name}-wmconfig.patch
+Patch1:                %{name}-vfmg.patch
 Patch2:                %{name}-pixmaps.patch
 Patch3:                %{name}-shared.patch
 Patch4:                %{name}-areas.patch
@@ -226,7 +226,7 @@ utilizando componentes est
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch10 -p1
+#%patch10 -p1
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
@@ -242,6 +242,12 @@ mv -f po/{no,nb}.po
 mv -f po/{zh_TW.Big5,zh_TW}.po
 mv -f WPrefs.app/po/{zh_TW.Big5,zh_TW}.po
 
+# don't use x86 asm, it's broken
+# (wrlib/x86_specific.c contains far too many assumptions about function
+#  frame used by gcc, so it can crash depending on gcc version and
+#  optimizations - and did so in Ac i686 packages)
+%{__perl} -pi -e 's/test \$x86 = 1/false/' configure.ac
+
 %build
 %{__libtoolize}
 %{__aclocal}