- release 5 (mainly merge bunch patches from Debian):

-- stolen_from_HEAD:
+ Alan Hourihane: fix typo in Bitmap.h (#4757)
+ Mark Vojkovich: The tdfx driver wasn't setting pScrn->fbOffset.  This
  seems to have been preventing the V4L module from working properly.
+ Marc Aurele La France: Fix bogus handling of BUS_CNTL Mach64 register
+ Mark Vojkovich: Have fb observe the pGC->fExpose flag.
+ Paulo Cesar Pereira de Andrade: The fbdev driver uses the same DGA
  initialization code as the vesa driver, this fix the bug the same way
  done in the vesa driver.
+ Matthieu Herrb: shared libXft minor revision number increment
+ Mark Vojkovich: Fix bug in ProcDbeGetVisualInfo reported by HP.
-- sparc_pci_domains:
+ sparc specyfic changed ifor PCI domain (by David S. Miller),
-- s3virge_mx_console_corruption_fix:
+ small fix s3virge console corruption (by Adam J. Richter),
-- cirrus_driver_fix:
+ cirus fixes (by by Egbert Eich),
-- dri_directory_mode_fix:
+ This patch by Brendan O'Dea.
  The /dev/dri directory is created with a mode that is derived from the
  "Mode" entry in the "DRI" section, which dexconf creates as 666.
  Ethan Benson noted that this results in a world writable directory on
  the root filesystem which is undesirable.
  Given that the only things in that directory are character devices which
  require root permission to create, the directory permissions need not
  follow the Mode required for the devices but may be root:root 755.
-- alpha_GLX_align_fix:
+ this patch by Brian Paul adds on AXP -D__GLX_ALIGN64 to GLX_DEFS for compile
  GL/glx files,
-- manpage_link_fixes:
+ add missing man pages aliases by Branden Robinson,

Changed files:
    XFree86.spec -> 1.240

diff --git a/XFree86.spec b/XFree86.spec
index 5f33b3b754f7cdbd971f764214e83924ebf3c9e3..ffa4b813d9f8f6cc155db56a56b9fb8372031a4a 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -7,7 +7,7 @@ Summary(pt_BR): Programas b
 Summary(es):   Programas básicos y servidores para el sistema de ventanas XFree86
 Name:          XFree86
 Version:       4.1.0
-Release:       4
+Release:       5
 License:       MIT
 Group:         X11/XFree86
 Group(de):     X11/XFree86
@@ -62,6 +62,14 @@ Patch26:     %{name}-mkfontdir-chmod_644.patch
 Patch27:       %{name}-HasFreetype2.patch
 Patch28:       %{name}-libXfont-put-eof.patch
 Patch29:       %{name}-config-s3.patch
+Patch30:       %{name}-stolen_from_HEAD.patch
+Patch31:       %{name}-sparc_pci_domains.patch
+Patch32:       %{name}-s3virge_mx_console_corruption_fix.patch
+Patch33:       %{name}-cirrus_driver_fix.patch
+Patch34:       %{name}-dri_directory_mode_fix.patch
+Patch35:       %{name}-alpha_GLX_align_fix.patch
+Patch36:       %{name}-manpage_link_fixes.patch
+Patch37:       %{name}-XftConfig_in_correct_place.patch
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.0
@@ -1307,6 +1315,14 @@ X11R6-contrib in older releases.
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
+%patch37 -p1
 rm -f xc/config/cf/host.def
 tar zx -f %{SOURCE15} -C xc/programs/Xserver/hw/xfree86/drivers/
 
@@ -1522,7 +1538,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_libdir}/X11/doc
 %endif
 
-%{_libdir}/X11/XftConfig
+%{_sysconfdir}/XftConfig
 
 %dir %{_libdir}/X11/app-defaults
 %{_libdir}/X11/app-defaults/XCalc