SPECS: X11.spec - removed sparc64 from drivers not built there; pr...

qboosh qboosh at pld-linux.org
Sun Oct 30 13:12:30 CET 2005 

Author: qboosh                       Date: Sun Oct 30 12:12:30 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- removed sparc64 from drivers not built there; propagated sparcv9

---- Files affected:
SPECS:
   X11.spec (1.158 -> 1.159) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.158 SPECS/X11.spec:1.159
--- SPECS/X11.spec:1.158	Fri Oct 21 12:06:36 2005
+++ SPECS/X11.spec	Sun Oct 30 13:12:25 2005
@@ -170,10 +170,10 @@
 Obsoletes:	XFree86
 # for /usr/X11R6/bin/mkfontdir
 Obsoletes:	XFree86-font-utils
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 Obsoletes:	X11R6.1
 %endif
-ExclusiveArch:	%{ix86} alpha %{x8664} armv4l ia64 m68k ppc sparc sparc64
+ExclusiveArch:	%{ix86} %{x8664} alpha armv4l ia64 m68k ppc sparc sparc64 sparcv9
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define		_prefix		/usr/X11R6
@@ -721,7 +721,7 @@
 #Provides:	libXdamage-devel
 #Provides:	libXfixes-devel
 #Provides:	libXrender-devel
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 Obsoletes:	X11R6.1-devel
 %endif
 Obsoletes:	XFree86-devel
@@ -1459,7 +1459,7 @@
 #Provides:	libXdamage
 #Provides:	libXfixes
 #Provides:	libXrender
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 Obsoletes:	X11R6.1-libs
 %endif
 Obsoletes:	XFree86-libs
@@ -1610,7 +1610,7 @@
 Provides:	xft-static = 2.1.6
 Provides:	xpm-static
 Provides:	xrender-static = 0.8.4
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 Obsoletes:	X11R6.1-devel
 %endif
 Obsoletes:	XFree86-static
@@ -2706,7 +2706,7 @@
 %{_includedir}/X11/Xserver
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-apm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
@@ -2714,14 +2714,14 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%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 %{x8664} mips ppc arm sparc64
+%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
@@ -2729,7 +2729,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} alpha sparc64
+%ifarch %{ix86} ia64 %{x8664} alpha
 %files driver-cirrus
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
@@ -2743,7 +2743,7 @@
 %{_mandir}/man4/cyrix.4*
 %endif
 
-%ifarch %{ix86} ia64 %{x8664} alpha sparc sparc64 mips ppc arm superh
+%ifarch %{ix86} ia64 %{x8664} alpha sparc sparc64 sparcv9 mips ppc arm superh
 %files driver-fbdev
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
@@ -2768,7 +2768,7 @@
 %{_mandir}/man4/glint.4*
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-i128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
@@ -2776,7 +2776,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 sparc64
+%ifarch %{ix86} ia64
 %files driver-i740
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
@@ -2784,11 +2784,11 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-i810
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
-%ifarch %{ix86} ia64 sparc64
+%ifarch %{ix86} ia64
 %attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
 %endif
 %attr(755,root,root) %{_libdir}/modules/dri/i915_dri.so
@@ -2803,7 +2803,7 @@
 %{_mandir}/man4/imstt.4*
 %endif
 
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 mips alpha ppc arm
 %files driver-mga
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
@@ -2814,7 +2814,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
 %files driver-neomagic
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
@@ -2822,7 +2822,7 @@
 %endif
 
 # Devel: %{ix86} sparc sparc64 %{x8664}
-%ifarch mips sparc64
+%ifarch mips
 %files driver-newport
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.o
@@ -2837,7 +2837,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} mips alpha arm ppc sparc64
+%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
@@ -2867,7 +2867,7 @@
 %{_mandir}/man4/radeon.4*
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} alpha sparc64
+%ifarch %{ix86} ia64 %{x8664} alpha
 %files driver-rendition
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
@@ -2876,7 +2876,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm sparc64
+%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
@@ -2891,7 +2891,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm sparc64
+%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
@@ -2899,7 +2899,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} alpha sparc64
+%ifarch %{ix86} ia64 %{x8664} alpha
 %files driver-siliconmotion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
@@ -2916,35 +2916,35 @@
 %{_mandir}/man4/sis.4*
 %endif
 
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 %files driver-sunbw2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
 %{_mandir}/man4/sunbw2.4*
 %endif
 
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 %files driver-suncg14
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
 %{_mandir}/man4/suncg14.4*
 %endif
 
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 %files driver-suncg3
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
 %{_mandir}/man4/suncg3.4*
 %endif
 
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 %files driver-suncg6
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
 %{_mandir}/man4/suncg6.4*
 %endif
 
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 %files driver-sunffb
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
@@ -2953,21 +2953,21 @@
 %{_mandir}/man4/sunffb.4*
 %endif
 
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 %files driver-sunleo
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
 %{_mandir}/man4/sunleo.4*
 %endif
 
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
 %files driver-suntcx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
 %{_mandir}/man4/suntcx.4*
 %endif
 
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha arm ppc
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 mips alpha arm ppc
 %files driver-tdfx
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
@@ -2978,14 +2978,14 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} sparc64 ia64 %{x8664} 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} sparc64 ia64 %{x8664} 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
@@ -3007,7 +3007,7 @@
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} sparc64 ia64
+%ifarch %{ix86} ia64
 %files driver-vmware
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.o
@@ -3153,10 +3153,10 @@
 %{_mandir}/man4/tek4957.4*
 %{_mandir}/man4/ur98.4*
 %{_mandir}/man4/v4l.4*
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 alpha ppc arm
 %{_mandir}/man4/vga.4*
 %endif
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9
 %{_mandir}/man4/vesa.4*
 %endif
 %{_mandir}/man4/void.4*
@@ -3439,6 +3439,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.159  2005/10/30 12:12:25  qboosh
+- removed sparc64 from drivers not built there; propagated sparcv9
+
 Revision 1.158  2005/10/21 10:06:36  glen
 - no flags for ld.so.conf file
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.158&r2=1.159&f=u

More information about the pld-cvs-commit mailing list