From fffeda3bc49d7f582102e148d5dcd6261e9f2baf Mon Sep 17 00:00:00 2001
From: Andreas Bierfert <awjb@fedoraproject.org>
Date: May 31 2005 11:49:57 +0000
Subject: - upgrade to 0.91.0


---

diff --git a/WindowMaker.spec b/WindowMaker.spec
index 02cf32d..d7ae80e 100644
--- a/WindowMaker.spec
+++ b/WindowMaker.spec
@@ -1,19 +1,15 @@
 Summary:	A fast, feature rich Window Manager
 Name:		WindowMaker
-Version:	0.80.2
-Release:	7
+Version:	0.91.0
+Release:	1
 
 License:	GPL
 Group:		User Interface/Desktops
 URL:		http://www.windowmaker.org/
-Source0:	%{name}-%{version}.tar.bz2
-Patch0:		windowmaker-src_actions_c.patch
-Patch1:		windowmaker-src_event_c.patch
-Patch2:		windowmaker-src_workspace_c.patch
+Source0:	ftp://windowmaker.org/pub/source/release/WindowMaker-0.91.0.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	XFree86-devel libpng-devel libjpeg-devel libungif-devel
-BuildRequires:	libtiff-devel zlib-devel gettext
-Obsoletes:	WindowMaker-libs
+BuildRequires:	xorg-x11-devel libpng-devel libjpeg-devel libungif-devel
+BuildRequires:	libtiff-devel zlib-devel gettext-devel
 
 %package devel
 Summary:	libraries needed for WindowMaker.
@@ -38,17 +34,16 @@ GUI. This package contains development files for WindowMaker libraries
 
 %prep
 %setup -q
-%patch0 -p0 -b .gtk2
-%patch1 -p0 -b .gtk2
-%patch2 -p0 -b .focus
-
 
 %build
 LINGUAS=`(cd po ; echo *.po|sed 's/zh_TW.Big5.po//g;s/.po//g')`
 GNUSTEP_LOCAL_ROOT='%{_libdir}/GNUstep'
 NLSDIR="%{_datadir}/locale"
 export LINGUAS NLSDIR GNUSTEP_LOCAL_ROOT
-%configure --enable-gnome --enable-kde --enable-usermenu
+%configure --enable-gnome --enable-kde --enable-usermenu --enable-xinerama \
+--enable-fast-install --enable-modelock
+# disable mmx for now
+sed -i -e's/#define ASM_X86_MMX 1/#undef ASM_X86_MMX/' src/config.h
 # Dont use _smp_mflags. Race condition.
 make
 
@@ -89,9 +84,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/wraster.h
 %{_libdir}/lib*.a
 %{_libdir}/libwraster.so
+%{_libdir}/pkgconfig/*.pc
 
 
 %changelog
+* Tue May 31 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+0.91.0-1
+- upgrade to 0.91.0
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
diff --git a/windowmaker-src_actions_c.patch b/windowmaker-src_actions_c.patch
deleted file mode 100644
index cf560d6..0000000
--- a/windowmaker-src_actions_c.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/actions.c	Mon Aug 11 15:29:31 2003
-+++ src/actions.c	Mon Aug 11 15:31:56 2003
-@@ -144,6 +144,14 @@
-       old_scr=scr;
-     old_focused=old_scr->focused_window;
-
-+    /*
-+     * Safeguard: make sure the timestamp is monotonically increasing
-+     * (very unlikely that this will be needed, still a safeguard)
-+     */
-+    if (timestamp <= LastFocusChange)
-+	    timestamp = LastFocusChange + 1;
-+
-+
-     LastFocusChange = timestamp;
-
- /*
-@@ -150,8 +158,8 @@
-  * This is a hack, because XSetInputFocus() should have a proper
-  * timestamp instead of CurrentTime but it seems that some times
-  * clients will not receive focus properly that way.
-+ */
-     if (ignoreTimestamp)
--*/
-       timestamp = CurrentTime;
-
-     if (old_focused)
diff --git a/windowmaker-src_event_c.patch b/windowmaker-src_event_c.patch
deleted file mode 100644
index bfc78b5..0000000
--- a/windowmaker-src_event_c.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/event.c	Mon Aug 11 15:29:31 2003
-+++ src/event.c	Mon Aug 11 15:32:06 2003
-@@ -402,7 +402,6 @@
- static void
- saveTimestamp(XEvent *event)
- {
--    LastTimestamp = CurrentTime;
- 
-     switch (event->type) {
-      case ButtonRelease:
diff --git a/windowmaker-src_workspace_c.patch b/windowmaker-src_workspace_c.patch
deleted file mode 100644
index be5a0fe..0000000
--- a/windowmaker-src_workspace_c.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/workspace.c	Mon Aug 11 15:29:33 2003
-+++ src/workspace.c	Mon Aug 11 15:33:33 2003
-@@ -574,10 +574,12 @@
-                               &foo, &foo, &foo, &foo, &mask)) {
- 		tmp = wWindowFor(win);
- 	    }
--	    if (!tmp && wPreferences.focus_mode == WKF_SLOPPY) {
--		wSetFocusTo(scr, foc);
--	    } else {
--		wSetFocusTo(scr, tmp);
-+	    if (!tmp) {
-+		if (wPreferences.focus_mode == WKF_SLOPPY) {
-+		    wSetFocusTo(scr, foc);
-+	        } else {
-+		    wSetFocusTo(scr, tmp);
-+		}
- 	    }
- 	}
-     }