- stop being uber-smart and just use TERM=xterm (not xterm-color),

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index f719ac5a607e751075f80c26dcac53beeacaaca0..08559ef34ca61f03361aa14719fe8b600430c866 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -68,7 +68,7 @@ Source50:     xcalc.png
 Source51:      xload.png
 Source52:      xmag.png
 Source53:      http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: a5738dcfa20119fa3e06ce479ca94acf
+# NoSource53-md5: b3e8590b46dbab4341841592147fba26
 Source54:      XFree86-xrender.pc
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-HasZlib.patch
@@ -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.159
+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
@@ -163,6 +163,7 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define                _wallpapersdir  /usr/share/wallpapers
 %define                _wmpropsdir     /usr/share/wm-properties
 %define                _xsessdir       /usr/share/xsessions
+%define                _wmstylesdir    /etc/sysconfig/wmstyles
 %define                _libx11dir      %{_prefix}/lib/X11
 %define                _appdefsdir     %{_libx11dir}/app-defaults
 
@@ -216,7 +217,7 @@ puestos a disposici
 X Window System jest graficznym interfejsem u¿ytkownika; cechuje siê
 mo¿liwo¶ci± pracy w wielu oknach, z wieloma klientami i do tego w
 ró¿nych wystrojach okien. :) Jest u¿ywany na wiêkszo¶ci platform
-sytemów Unix, a klienci mog± byæ uruchamiani tak¿e pod innymi
+systemów Unix, a klienci mog± byæ uruchamiani tak¿e pod innymi
 popularnymi systemami okienkowymi. Protokó³ X pozwala na uruchamianie
 aplikacji zarówno z lokalnej maszyny jak i poprzez sieæ - daj±c przez
 to elastyczn± implementacjê architektury klient/serwer.
@@ -669,31 +670,22 @@ Obsoletes:        xrender-devel
 %description devel
 Libraries, header files, and documentation for developing programs
 that run as X clients. It includes the base Xlib library as well as
-the Xt and Xaw widget sets. For information on programming with these
-libraries, PLD recommends the series of books on X Programming
-produced by O'Reilly and Associates.
+the Xt and Xaw widget sets.
 
 %description devel -l de
 Libraries, Header-Dateien und Dokumentation zum Entwickeln von
 Programmen, die als X-Clients laufen. Enthält die Xlib-Library und die
-Widget-Sätze Xt und Xaw. Information zum Programmieren mit diesen
-Libraries finden Sie in der Buchreihe zur X-Programmierung von
-O'Reilly and Associates.
+Widget-Sätze Xt und Xaw.
 
 %description devel -l fr
 Bibliothéques, fichiers d'en-tête, et documentation pour développer
 des programmes s'exécutant en clients X. Cela comprend la Bibliothéque
-Xlib de base aussi bien que les ensembles de widgets Xt et Xaw. Pour
-des informations sur la programmation avec ces Bibliothéques, Red Hat
-recommande la série d'ouvrages sur la programmation X editée par
-O'Reilly and Associates.
+Xlib de base aussi bien que les ensembles de widgets Xt et Xaw.
 
 %description devel -l pl
 Pliki nag³ówkowe, dokumentcja dla programistów rozwijaj±cych aplikacje
 klienckie pod X Window. Zawiera podstawow± bibliotekê Xlib a tak¿e Xt
-i Xaw. Wiêcej informacji nt. pisania programów przy u¿yciu tych
-bibliotek mo¿esz znale¼æ w ksi±¿kach wydawnictwa O'Reilly and
-Associates (X Programming) polecanych przez Red Hata.
+i Xaw.
 
 %description devel -l ru
 XFree86-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ
@@ -778,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}
@@ -799,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}
@@ -902,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}
@@ -983,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}
@@ -1450,6 +1442,8 @@ XFree86-xfs.
 Summary:       Modules with X servers extensions
 Summary(pl):   Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
 Group:         X11/Servers
+Obsoletes:     XFree86-module-PEX
+Obsoletes:     XFree86-module-XIE
 
 %description modules
 Modules with X servers extensions.
@@ -1741,6 +1735,7 @@ Requires: %{name}-sessreg = %{epoch}:%{version}-%{release}
 Requires:      /usr/X11R6/bin/sessreg
 Provides:      XDM
 Provides:      xdm = %{epoch}:%{version}-%{release}
+Obsoletes:     entrance
 Obsoletes:     gdm
 Obsoletes:     kdm
 Obsoletes:     wdm
@@ -1898,8 +1893,8 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
        $RPM_BUILD_ROOT/usr/{bin,include,lib} \
        $RPM_BUILD_ROOT/var/{log,lib/xkb} \
        $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
-       $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
-       $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir}} \
+       $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial,Bluecurve}} \
+       $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
        $RPM_BUILD_ROOT%{_pkgconfigdir}
 
 %{__make} -C xc        install install.man \
@@ -2042,13 +2037,13 @@ rm -rf $RPM_BUILD_ROOT
 
 #--- %post{un}, %preun, %verifyscript, %trigge ----------
 
-%post   DPS -p /sbin/ldconfig
+%post  DPS -p /sbin/ldconfig
 %postun DPS -p /sbin/ldconfig
 
-%post   OpenGL-libGL -p /sbin/ldconfig
+%post  OpenGL-libGL -p /sbin/ldconfig
 %postun OpenGL-libGL -p /sbin/ldconfig
 
-%post   OpenGL-libs -p /sbin/ldconfig
+%post  OpenGL-libs -p /sbin/ldconfig
 %postun OpenGL-libs -p /sbin/ldconfig
 
 %post libs
@@ -2103,22 +2098,8 @@ if [ "$1" = "0" ]; then
 fi
 
 %pre xfs
-if [ -n "`/usr/bin/getgid xfs`" ]; then
-       if [ "`/usr/bin/getgid xfs`" != "56" ]; then
-               echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/groupadd -g 56 -r -f xfs
-fi
-if [ -n "`/bin/id -u xfs 2>/dev/null`" ]; then
-       if [ "`/bin/id -u xfs`" != "56" ]; then
-               echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2
-               exit 1
-       fi
-else
-       /usr/sbin/useradd -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs 1>&2
-fi
+%groupadd -P %{name}-xfs -g 56 -r -f xfs
+%useradd -P %{name}-xfs -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs
 
 %post xfs
 /sbin/chkconfig --add xfs
@@ -2559,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
@@ -2567,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
@@ -2582,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
@@ -2615,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
@@ -2641,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)
@@ -2655,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)
@@ -2689,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
@@ -2704,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*
@@ -2712,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
@@ -2728,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
@@ -2743,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
@@ -2751,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
@@ -2819,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
@@ -2830,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
@@ -2872,6 +2853,9 @@ fi
 %dir %{_themesdir}
 %dir %{_themesdir}/Default
 %dir %{_themesdir}/ThinIce
+%dir %{_themesdir}/Metal
+%dir %{_themesdir}/Industrial
+%dir %{_themesdir}/Bluecurve
 %{_libx11dir}/XErrorDB
 %{_libx11dir}/XKeysymDB
 %dir %{_appdefsdir}
@@ -2907,6 +2891,7 @@ fi
 %dir %{_wallpapersdir}
 %dir %{_wmpropsdir}
 %dir %{_xsessdir}
+%dir %{_wmstylesdir}
 %attr(755,root,root) %{_libdir}/libFS.so.*.*
 %attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*
 %attr(755,root,root) %{_libdir}/libICE.so.*.*
@@ -2954,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
@@ -2994,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*