rpms/linuxwacom/devel linuxwacom-0.7.2-delibcwrap.patch, NONE, 1.1 linuxwacom.spec, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/linuxwacom/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25053/devel

Modified Files:
	linuxwacom.spec 
Added Files:
	linuxwacom-0.7.2-delibcwrap.patch 
Log Message:
auto-import linuxwacom-0.7.2-2 on branch devel from linuxwacom-0.7.2-2.src.rpm

linuxwacom-0.7.2-delibcwrap.patch:
 xf86Wacom.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

--- NEW FILE linuxwacom-0.7.2-delibcwrap.patch ---
--- ./src/xf86Wacom.h.delibcwrap	2006-04-10 14:23:28.000000000 -0400
+++ ./src/xf86Wacom.h	2006-04-10 14:24:13.000000000 -0400
@@ -64,16 +64,16 @@
  * XFree86 V4.x Headers
  ****************************************************************************/
 
-#ifndef XFree86LOADER
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
 #include <unistd.h>
 #include <errno.h>
-#endif
 
 #include <misc.h>
 #include <xf86.h>
 #define NEED_XF86_TYPES
 #if !defined(DGUX)
-#include <xf86_ansic.h>
 #include <xisb.h>
 #endif
 #include <xf86_OSproc.h>


Index: linuxwacom.spec
===================================================================
RCS file: /cvs/dist/rpms/linuxwacom/devel/linuxwacom.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- linuxwacom.spec	11 Feb 2006 04:24:37 -0000	1.28
+++ linuxwacom.spec	10 Apr 2006 18:26:23 -0000	1.29
@@ -5,7 +5,7 @@
 Name:		linuxwacom
 Version:	0.7.2
 Epoch:		0
-Release:	1.2
+Release:	2
 Summary:	Wacom Drivers from Linux Wacom Project
 
 Group:		User Interface/X Hardware Support
@@ -15,10 +15,11 @@
 Source1:	10-wacom.rules
 Patch2:		linuxwacom-fsp.patch
 Patch3:		linuxwacom-0.7.2-modular-sdk.patch
+Patch4:		linuxwacom-0.7.2-delibcwrap.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}
-BuildRequires:	libX11-devel, libXi-devel, xorg-x11-server-sdk, ncurses-devel
-Requires:	Xserver, udev >= 030-21
+BuildRequires:	libX11-devel, libXi-devel, xorg-x11-server-sdk >= 1.0.99.901, ncurses-devel
+Requires:	xorg-x11-server-Xorg >= 1.0.99.901, udev >= 030-21
 ExclusiveArch:  %{ix86} x86_64 alpha ia64 ppc sparc sparc64
 
 %description 
@@ -41,6 +42,7 @@
 
 %patch2 -p1 -b .fsp
 %patch3 -p0 -b .modular-sdk
+%patch4 -p0 -b .delibcwrap
 
 %build
 libtoolize --copy --force
@@ -97,6 +99,9 @@
 %{_libdir}/libwacomcfg*.so
 
 %changelog
+* Mon Apr 10 2006 Adam Jackson <ajackson at redhat.com> 0:0.7.2-2
+- Delibcwrap and otherwise rebuild for 7.1RC1 ABI changes.
+
 * Fri Feb 10 2006 Jesse Keating <jkeating at redhat.com> - 0:0.7.2-1.2
 - bump again for double-long bug on ppc(64)