rpms/xorg-x11-drv-evdev/devel evdev-1.1.0-ia64-build-fix.patch, NONE, 1.1 xorg-x11-drv-evdev.spec, 1.10, 1.11

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-drv-evdev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv10262/devel

Modified Files:
	xorg-x11-drv-evdev.spec 
Added Files:
	evdev-1.1.0-ia64-build-fix.patch 
Log Message:
auto-import xorg-x11-drv-evdev-1.1.0-3 on branch devel from xorg-x11-drv-evdev-1.1.0-3.src.rpm

evdev-1.1.0-ia64-build-fix.patch:
 evdev.h |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE evdev-1.1.0-ia64-build-fix.patch ---
--- src/evdev.h.ia64-build-fix	2006-04-10 13:53:55.000000000 -0400
+++ src/evdev.h	2006-04-10 13:54:28.000000000 -0400
@@ -68,13 +68,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#define BITS_PER_LONG		(sizeof(long) * 8)
-#define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
-#define OFF(x) 			((x)%BITS_PER_LONG)
-#define LONG(x)			((x)/BITS_PER_LONG)
-#define BIT(x)			(1UL<<((x)%BITS_PER_LONG))
-#define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
-
 /* 2.4 compatibility */
 #ifndef EVIOCGSW
 
@@ -101,6 +94,13 @@
 #endif
 /* end compat */
 
+#define BITS_PER_LONG		(sizeof(long) * 8)
+#define NBITS(x)		((((x)-1)/BITS_PER_LONG)+1)
+#define OFF(x) 			((x)%BITS_PER_LONG)
+#define LONG(x)			((x)/BITS_PER_LONG)
+#define BIT(x)			(1UL<<((x)%BITS_PER_LONG))
+#define test_bit(bit, array)    ((array[LONG(bit)] >> OFF(bit)) & 1)
+
 #include <X11/extensions/XKB.h>
 #include <X11/extensions/XKBstr.h>
 


Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-evdev/devel/xorg-x11-drv-evdev.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- xorg-x11-drv-evdev.spec	10 Apr 2006 04:54:23 -0000	1.10
+++ xorg-x11-drv-evdev.spec	10 Apr 2006 18:02:16 -0000	1.11
@@ -7,26 +7,28 @@
 Summary:   Xorg X11 evdev input driver
 Name:      xorg-x11-drv-evdev
 Version: 1.1.0
-Release: 2
+Release: 3
 URL:       http://www.x.org
 Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# ia64 disabled momentarily
-ExclusiveArch: %{ix86} x86_64 ppc alpha sparc sparc64
+ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
 BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 
 Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
+Patch0: evdev-1.1.0-ia64-build-fix.patch
+
 %description 
 X.Org X11 evdev input driver.
 
 %prep
 %setup -q -n %{tarball}-%{version}
+%patch0 -p0 -b .ia64-build-fix
 
 %build
 %configure --disable-static
@@ -53,6 +55,9 @@
 %{_mandir}/man4/evdev.4*
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-3
+- Work around header pollution on ia64, re-add to arch list.
+
 * Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 1.1.0-2
 - Disable on ia64 until build issues are sorted.