* Wed Jan 31 2007 Adam Jackson <ajax@redhat.com> 1.2.0-4

- Fix typo in SDK header. (#222487)
This commit is contained in:
Adam Jackson 2007-01-31 15:26:55 +00:00
parent 08b044418f
commit bc24ef27a4
2 changed files with 17 additions and 1 deletions

View File

@ -8,7 +8,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.2.0
Release: 3%{?dist}
Release: 4%{?dist}
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@ -49,6 +49,7 @@ Patch1009: xorg-x11-server-1.2.0-maxpixclock-option.patch
Patch2001: xserver-1.2.0-geode-mmx.patch
Patch2002: xserver-1.2.0-xephyr-keysym-madness.patch
Patch2003: xserver-1.2.0-vfprintf.patch
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@ -329,6 +330,7 @@ drivers, input drivers, or other X modules should install this package.
%patch2001 -p1 -b .geode-mmx
%patch2002 -p1 -b .xephyr-keysym
%patch2003 -p1 -b .vfprintf
%build
#FONTDIR="${datadir}/X11/fonts"
@ -637,6 +639,9 @@ rm -rf $RPM_BUILD_ROOT
# -------------------------------------------------------------------
%changelog
* Wed Jan 31 2007 Adam Jackson <ajax@redhat.com> 1.2.0-4
- Fix typo in SDK header. (#222487)
* Mon Jan 29 2007 Adam Jackson <ajax@redhat.com> 1.2.0-3
- Fix MMX check on AMD CPUs. (#222332)
- Fix Xephyr keysym init on LP64. (#224311)

View File

@ -0,0 +1,11 @@
--- xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h.jx 2007-01-22 22:13:15.000000000 -0500
+++ xorg-server-1.2.0/hw/xfree86/os-support/xf86_libc.h 2007-01-29 18:13:11.000000000 -0500
@@ -428,7 +428,7 @@
#define toupper(i) xf86toupper(i)
#undef ungetc
#define ungetc(i,FP) xf86ungetc(i,FP)
-#undef vfprinf
+#undef vfprintf
#define vfprintf(p,f,a) xf86vfprintf(p,f,a)
#undef vsnprintf
#define vsnprintf(s,n,f,a) xf86vsnprintf(s,n,f,a)