- use x8664 macro

Changed files:
    XFree86.spec -> 1.612

diff --git a/XFree86.spec b/XFree86.spec
index 8638771429f9d7284da64367e161d727db07d9f5..08559ef34ca61f03361aa14719fe8b600430c866 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -129,7 +129,7 @@ Patch57:    %{name}-libGL-exec-shield-fixes-v2.patch
 URL:           http://www.xfree86.org/
 BuildRequires: /usr/bin/perl
 # Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86} amd64 ia64
+%ifarch %{ix86} %{x8664} ia64
 %{?with_glide:BuildRequires:   Glide2x_SDK}
 %endif
 BuildRequires: bison
@@ -141,7 +141,7 @@ BuildRequires:      libpng-devel
 BuildRequires: libstdc++-devel
 BuildRequires: ncurses-devel
 BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.202
+BuildRequires: rpmbuild(macros) >= 1.213
 BuildRequires: tcl-devel
 BuildRequires: utempter-devel
 BuildRequires: zlib-devel
@@ -153,7 +153,7 @@ Obsoletes:  xterm
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1
 %endif
-ExclusiveArch: %{ix86} alpha amd64 armv4l ia64 m68k ppc sparc
+ExclusiveArch: %{ix86} %{x8664} alpha armv4l ia64 m68k ppc sparc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -770,7 +770,7 @@ Summary(pl):        Sterownik do kart ATI Rage 128
 Group:         X11/Servers
 Requires:      %{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:      %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
 Requires:      %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
@@ -791,7 +791,7 @@ Group:              X11/Servers
 Requires:      %{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
 Requires:      %{name}-driver-ati = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:      %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
 Requires:      %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
@@ -894,7 +894,7 @@ Summary(pl):        Sterownik do kart GLINT i Permedia
 Group:         X11/Servers
 Requires:      %{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:      %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
 Requires:      %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
@@ -975,7 +975,7 @@ Summary(pl):        Sterownik do kart Matrox
 Group:         X11/Servers
 Requires:      %{name}-Xserver = %{epoch}:%{version}-%{release}
 Requires:      %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 # for dri
 Requires:      %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
 Requires:      %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
@@ -2540,7 +2540,7 @@ fi
 %{_includedir}/X11/Xserver
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-apm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
@@ -2548,14 +2548,14 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-ark
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 mips ppc arm
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
 %files driver-chips
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
@@ -2563,21 +2563,21 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%ifarch %{ix86} ia64 %{x8664} alpha
 %files driver-cirrus
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
 %{_mandir}/man4/cirrus.4*
 %endif
 
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-cyrix
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
 %{_mandir}/man4/cyrix.4*
 %endif
 
-%ifarch %{ix86} ia64 amd64 sparc sparc64 mips ppc arm superh
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips ppc arm superh
 %files driver-fbdev
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
@@ -2596,13 +2596,13 @@ fi
 %files driver-glint
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
 %endif
 %{_mandir}/man4/glint.4*
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-i128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
@@ -2622,13 +2622,13 @@ fi
 %files driver-i810
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
-# i810_dri alone is built on amd64 - what for?
+# i810_dri alone is built on x86_64 - what for?
 %attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
 %attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
 %{_mandir}/man4/i810.4*
 %endif
 
-# Devel: %{ix86} sparc sparc64 ppc amd64
+# Devel: %{ix86} sparc sparc64 ppc %{x8664}
 %if 0
 %files driver-imstt
 %defattr(644,root,root,755)
@@ -2636,25 +2636,25 @@ fi
 %{_mandir}/man4/imstt.4*
 %endif
 
-%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha ppc arm
 %files driver-mga
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
 %endif
 %{_mandir}/man4/mga.4*
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-neomagic
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
 %{_mandir}/man4/neomagic.4*
 %endif
 
-# Devel: %{ix86} sparc sparc64 amd64
+# Devel: %{ix86} sparc sparc64 %{x8664}
 %ifarch mips
 %files driver-newport
 %defattr(644,root,root,755)
@@ -2670,7 +2670,7 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 mips alpha arm ppc
+%ifarch %{ix86} ia64 %{x8664} mips alpha arm ppc
 %files driver-nv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
@@ -2685,7 +2685,7 @@ fi
 %files driver-r128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
 %endif
 %{_mandir}/man4/r128.4*
@@ -2693,14 +2693,14 @@ fi
 %files driver-radeon
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
 %attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
 %endif
 %{_mandir}/man4/radeon.4*
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%ifarch %{ix86} ia64 %{x8664} alpha
 %files driver-rendition
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
@@ -2709,14 +2709,14 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
 %files driver-s3virge
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
 %{_mandir}/man4/s3virge.4*
 %endif
 
-%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
 %files driver-s3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
@@ -2724,7 +2724,7 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
 %files driver-savage
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
@@ -2732,14 +2732,14 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%ifarch %{ix86} ia64 %{x8664} alpha
 %files driver-siliconmotion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
 %{_mandir}/man4/siliconmotion.4*
 %endif
 
-%ifarch %{ix86} ia64 amd64 mips ppc arm
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
 %files driver-sis
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
@@ -2800,7 +2800,7 @@ fi
 %{_mandir}/man4/suntcx.4*
 %endif
 
-%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha arm ppc
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha arm ppc
 %files driver-tdfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
@@ -2811,21 +2811,21 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%ifarch %{ix86} ia64 %{x8664} alpha
 %files driver-tga
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 mips ppc arm
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
 %files driver-trident
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
 %{_mandir}/man4/trident.4*
 %endif
 
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-tseng
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
@@ -2939,13 +2939,13 @@ fi
 %dir %{_libdir}/modules/drivers
 %attr(755,root,root) %{_libdir}/modules/*.a
 %attr(755,root,root) %{_libdir}/modules/codeconv
-%ifnarch amd64
+%ifnarch %{x8664}
 %attr(755,root,root) %{_libdir}/modules/drivers/linux
 %endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
 %endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64
 %attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
 %endif
 %dir %{_libdir}/modules/extensions
@@ -2979,13 +2979,13 @@ fi
 %{_mandir}/man4/penmount.4*
 %{_mandir}/man4/tek4957.4*
 %{_mandir}/man4/ur98.4*
-%ifnarch amd64
+%ifnarch %{x8664}
 %{_mandir}/man4/v4l.4*
 %endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
 %{_mandir}/man4/vga.4*
 %endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64
 %{_mandir}/man4/vesa.4*
 %endif
 %{_mandir}/man4/void.4*