-%define _sver %(echo %{version} | tr -d .)
+# SECURITY: CAN-2004-0083 CAN-2004-0084 CAN-2004-0106 CAN-2004-0419
+
+# _without_tdfx disables tdfx build
+
+%define _sver %(echo %{version} | tr -d .)
Summary: XFree86 Window System servers and basic programs
Summary(de): Xfree86 Window-System-Server und grundlegende Programme
Summary(es): Programas básicos y servidores para el sistema de ventanas XFree86
Summary(fr): Serveurs du système XFree86 et programmes de base
+Summary(ja): XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
+Summary(ko): X¿¡ ÇÊ¿äÇÑ ±âº»ÀûÀÎ ±Û²Ã°ú ÇÁ·Î±×·¥°ú ¹®¼µé
Summary(pl): XFree86 Window System wraz z podstawowymi programami
Summary(tr): XFree86 Pencereleme Sistemi sunucularý ve temel programlar
Summary(pt_BR): Programas básicos e servidores para o sistema de janelas XFree86
Summary(ru): âÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÄÌÑ ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ ÐÏÄ X
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
+Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.2.0
-Release: 5
+Version: 4.2.1
+Release: 13
License: MIT
Group: X11/XFree86
-Source0: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-1.tgz
-Source1: ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
-Source2: xdm.pamd
-Source3: xserver.pamd
-Source4: xdm.init
-Source5: xfs.init
-Source6: xfs.config
-Source7: XTerm.ad-pl
-Source8: xdm.sysconfig
-Source9: xfs.sysconfig
-Source10: twm.desktop
-Source11: xclipboard.desktop
-Source12: xconsole.desktop
-Source13: xterm.desktop
-Source14: xlogo64.png
-Source15: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
-Source16: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20020524.tar.bz2
+Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz
+# Source0-md5: ad43a8e9e39703322005cd6f7145b77f
+Source1: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
+# Source1-md5: 0a15b1c374256b5cad7961807baa3896
+Source2: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+# Source2-md5: 8d43c01d364576c195a5294279f92566
+Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
+# Source3-md5: a184106bb83cb27c6963944d9243ac3f
+Source4: xdm.pamd
+Source5: xserver.pamd
+Source6: xdm.init
+Source7: xfs.init
+Source8: xfs.config
+Source9: XTerm.ad-pl
+Source10: xdm.sysconfig
+Source11: xfs.sysconfig
+Source20: twm.desktop
+Source21: xeyes.desktop
+Source22: xedit.desktop
+Source23: xterm.desktop
+Source24: xclipboard.desktop
+Source25: xclock.desktop
+Source26: oclock.desktop
+Source27: xconsole.desktop
+Source30: xlogo64.png
+Source31: xeyes.png
+Source32: xedit.png
+Source33: xterm.png
+Source34: xclipboard.png
+Source35: xclock.png
+Source36: oclock.png
+Source37: xconsole.png
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch26: %{name}-HasFreetype2.patch
Patch27: %{name}-config-s3.patch
Patch28: %{name}-sparc_pci_domains.patch
-Patch29: %{name}-xkb-us_intl-missing-commas.patch
+Patch29: %{name}-XTerm.ad.patch
Patch30: %{name}-dri_directory_mode_fix.patch
Patch31: %{name}-alpha_GLX_align_fix.patch
Patch32: %{name}-XftConfig_in_correct_place.patch
Patch33: %{name}-PEX+XIE.patch
Patch34: %{name}-xman-manpaths.patch
Patch35: %{name}-ppc_drivers.patch
-Patch36: %{name}-4.2.0-branch-20020524.patch
+Patch36: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz
Patch37: %{name}-clearrts.patch
Patch38: %{name}-mga020414.patch
Patch39: %{name}-trident-9397.patch
-Patch40: %{name}-i815m.patch
+Patch40: %{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2
Patch41: %{name}-nv020414.patch
Patch42: %{name}-fix-07-s3trio64v2gx+netfinity.patch
Patch43: %{name}-prosavage.patch
Patch44: %{name}-xtt-null-pointer.patch
-Patch45: %{name}-vesa-xf86SetDpi-fix.patch
+Patch45: %{name}-i740-driver-update-cvs-20020617.patch
Patch46: %{name}-neomagic-Xv-support.patch
-
+Patch47: %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
+Patch48: %{name}-tdfx-should-be-2048-not-2046.patch
+Patch49: %{name}-tdfx-interlace.patch
+Patch50: %{name}-tdfx-fix-compiler-warnings.patch
+Patch51: %{name}-tdfx-fix-vtswitch-font-corruption.patch
+Patch52: %{name}-sis-option-swcursor.patch
+Patch53: %{name}-sis-unresolved-symbols.patch
+Patch54: %{name}-sis-maxxfbmem-fixup.patch
+Patch55: %{name}-Radeon9000.patch
+Patch56: %{name}-Xfont-Type1-large-DoS.patch
+# "strip -g libGLcore.a" left empty object debug_xform.o, which caused GLcore
+# loading failure with "debug_xform.o: no symbols"
+Patch57: %{name}-GLcore-strip-a-workaround.patch
+# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
+Patch58: %{name}-4.2.1-mit-shm-security.patch
+Patch59: %{name}-disable_glide.patch
+Patch60: %{name}-xterm-can-2003-0063.patch
+Patch61: %{name}-xlclocale-overflow.patch
+Patch62: %{name}-xterm-DECUDK-security-fix.patch
+Patch63: %{name}-font-overflows.patch
+Patch64: %{name}-bison.patch
+URL: http://www.xfree86.org/
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: zlib-devel
BuildRequires: libstdc++-devel
%ifarch %{ix86} alpha
-BuildRequires: Glide3-DRI-devel
+%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
%endif
# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
%ifarch %{ix86}
-BuildRequires: Glide2x_SDK
+%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
%endif
Requires: xauth
Requires: %{name}-libs = %{version}
# avoid Mesa dependency in XFree86-OpenGL-libs
# Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
-%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
+%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
%description
If you want to install the X Window System (TM) on your machine,
Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
-Conflicts: XFree86-driver-ati XFree86-driver-r128 XFree86-driver-radeon
%description driver-ati.2
-ATI video driver (ATI.2).
+ATI video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
%description driver-ati.2 -l pl
-Sterownik do kart ATI (ATI.2).
+Sterownik do kart ATI (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
%package driver-r128.2
Summary: ATI Rage 128 video driver (ATI.2)
Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
Requires: XFree86-driver-ati.2
-Conflicts: XFree86-driver-nvidia XFree86-driver-ati XFree86-driver-r128 XFree86-driver-radeon
+Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
%description driver-r128.2
-ATI Rage 128 video driver (ATI.2).
+ATI Rage 128 video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
%description driver-r128.2 -l pl
-Sterownik do kart ATI Rage 128 (ATI.2).
+Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
%package driver-radeon.2
Summary: ATI Radeon video driver (ATI.2)
Requires: %{name}-Xserver = %{version}-%{release}
Requires: XFree86-driver-ati.2
Requires: OpenGL
-Conflicts: XFree86-driver-nvidia XFree86-driver-ati XFree86-driver-r128 XFree86-driver-radeon
+Conflicts: XFree86-driver-nvidia
%description driver-radeon.2
-ATI Radeon video driver (ATI.2).
+ATI Radeon video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
%description driver-radeon.2 -l pl
-Sterownik do kart ATI Radeon (ATI.2).
+Sterownik do kart ATI Radeon (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
%package driver-chips
Summary: Chips and Technologies video driver
Summary(ru): òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ X Window System (X11R6.4)
Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
Group: X11/XFree86
-PreReq: grep
+Requires(post,postun): /sbin/ldconfig
+Requires(post,postun): grep
+Requires(postun): fileutils
Requires: %{name}-common = %{version}
Obsoletes: xpm
Provides: xpm
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
Group: X11/XFree86
+PreReq: rc-scripts
+Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}
Requires: pam >= 0.71
Requires: %{name}-libs = %{version}
Requires: sessreg = %{version}
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
-PreReq: chkconfig
Obsoletes: XFree86-xdm
Obsoletes: gdm
Obsoletes: kdm
Group: X11/XFree86
Requires: %{name}-libs = %{version}
Requires: XFree86-fonts-base
-PreReq: chkconfig
+PreReq: rc-scripts
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/useradd
Requires(pre): /usr/sbin/groupadd
+Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Obsoletes: xfsft XFree86-xfs
%ifarch ppc
%patch35
%endif
-cd xc
+%{?_without_tdfx:%patch35}
%patch36 -p0
-cd ..
%patch37 -p1
%patch38 -p1
#%patch39 -p1
-%patch40 -p1
+%patch40 -p0
%patch41 -p1
%patch42 -p1
%patch43 -p1
%patch44 -p1
%patch45 -p1
%patch46 -p1
+%{!?_without_tdfx:%patch47 -p0}
+%{!?_without_tdfx:%patch48 -p0}
+%{!?_without_tdfx:%patch49 -p1}
+#%patch50 -p0
+%{!?_without_tdfx:%patch51 -p0}
+#%patch52 -p1
+#%patch53 -p1
+%patch54 -p1
+%patch55 -p0
+%patch56 -p1
+%{!?debug:%patch57 -p1}
+%patch58 -p0
+%{?_without_tdfx:%patch59 -p0}
+%patch60 -p1
+%patch61 -p0
+%patch62 -p0
+%patch63 -p1
+%patch64 -p1
rm -f xc/config/cf/host.def
# New ATI drivers
cd xc/programs/Xserver/hw/xfree86/drivers
-bzcat %{SOURCE16} | tar x
+bzcat %{SOURCE2} | tar x
# ati.2 directory
#--- %build --------------------------
$RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
- $RPM_BUILD_ROOT{%{_applnkdir}/{Utilities,Terminals},%{_pixmapsdir}/mini} \
- $RPM_BUILD_ROOT%{_wmpropsdir}
+ $RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \
+ $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir}}
%{__make} -C xc "DESTDIR=$RPM_BUILD_ROOT" \
"DOCDIR=/usr/share/doc/%{name}-%{version}" \
install install.man
%ifnarch alpha
-install -d $RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati.2
+install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \
- $RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati.2/
+ $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
+install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
+ $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
+
%endif
# setting default X
ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X
# setting ghost X in /etc/X11 -- xf86config will fix this ...
-ln -sf ../..%{_bindir}/XFree86 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X
+ln -sf %{_bindir}/XFree86 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X
# add X11 links in /usr/bin, /usr/lib /usr/include
-ln -sf ../X11R6/include/X11 $RPM_BUILD_ROOT/usr/include/X11
-ln -sf ../X11R6/lib/X11 $RPM_BUILD_ROOT/usr/lib/X11
-ln -sf ../X11R6/bin $RPM_BUILD_ROOT/usr/bin/X11
+ln -sf %{_includedir}/X11 $RPM_BUILD_ROOT/usr/include/X11
+ln -sf %{_libdir}/X11 $RPM_BUILD_ROOT/usr/lib/X11
+ln -sf %{_bindir} $RPM_BUILD_ROOT/usr/bin/X11
# fix libGL*.so links
rm -f $RPM_BUILD_ROOT%{_libdir}/libGL*.so
# set up PLD xdm config
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
-install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps/
-install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/
-
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xdm
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xserver
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
-install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
-
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/xdm
-install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/xfs
-
-install %{SOURCE10} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
-install %{SOURCE11} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE12} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE13} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
-
-install %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
-bzip2 -dc %{SOURCE15} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps
+install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm
+
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/xdm
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/xserver
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
+install %{SOURCE9} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
+
+install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
+
+install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
+install %{SOURCE21} $RPM_BUILD_ROOT%{_applnkdir}/Amusements
+install %{SOURCE22} $RPM_BUILD_ROOT%{_applnkdir}/Editors
+install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
+install %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} \
+ $RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
+ %{SOURCE36} %{SOURCE37} \
+ $RPM_BUILD_ROOT%{_pixmapsdir}
+
+bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
rm -f $RPM_BUILD_ROOT%{_libdir}/X11/xkb/xkbcomp
ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp
-ln -sf ../../../share/doc/%{name}-%{version} \
- $RPM_BUILD_ROOT%{_libdir}/X11/doc
+ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libdir}/X11/doc
rm -f $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def
%triggerpostun modules -- XFree86-modules < 4.0.2
if [ -d /usr/X11R6/lib/X11/xkb ]; then
rm -rf /usr/X11R6/lib/X11/xkb
- ln -sf ../../../../etc/X11/xkb /usr/X11R6/lib/X11/xkb
+ ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb
fi
%post -n xdm
/sbin/chkconfig --add xdm
if [ -f /var/lock/subsys/xdm ]; then
- /etc/rc.d/init.d/xdm restart >&2
+ echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+ echo "WARNING: it will terminate all sessions opened from xdm!" >&2
else
echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
fi
%pre -n 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
+ echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2
exit 1
fi
else
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. Corrent this before installing xfs." 1>&2
+ echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2
exit 1
fi
else
%{_libdir}/X11/app-defaults/XTerm
%lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm
%{_libdir}/X11/app-defaults/XTerm-color
-%ifnarch sparc sparc64
-%{_libdir}/X11/app-defaults/XF86Cfg
-%endif
%attr(755,root,root) %{_libdir}/X11/lbxproxy
%attr(755,root,root) %{_libdir}/X11/proxymngr
%{_libdir}/libxkbui.a
%{_libdir}/libXrandr.a
%{_libdir}/libXss.a
-%{_libdir}/libXTrap.a
+%{_libdir}/libXTrap.a
%{_libdir}/libXv.a
-%{_libdir}/libXvMC.a
+%{_libdir}/libXvMC.a
%{_libdir}/libXxf86dga.a
%{_libdir}/libXxf86misc.a
%{_libdir}/libXxf86rush.a
%endif
%ifnarch sparc sparc64 alpha ppc
-%files driver-glide
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
-%{_mandir}/man4/glide*
+%{!?_without_tdfx:%files driver-glide}
+%{!?_without_tdfx:%defattr(644,root,root,755)}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o}
+%{!?_without_tdfx:%{_mandir}/man4/glide*}
%endif
%files driver-glint
%ifnarch alpha
%files driver-ati.2
%defattr(644,root,root,755)
-%dir %{_libdir}/modules/drivers/ati.2
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/ati*_drv.o
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/[bfmt]*_drv.o
+%dir %{_libdir}/modules.gatos/drivers
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/[bfmt]*_drv.o
%endif
%ifnarch alpha
%files driver-r128.2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/r128*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/r128*_drv.o
%ifnarch sparc sparc64
-%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
+%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
%endif
%{_mandir}/man4/r128*
%endif
%ifnarch alpha
%files driver-radeon.2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/radeon*_drv.o
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/saa7114_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/radeon*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/saa7114_drv.o
%ifnarch sparc sparc64
-%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
+%attr(755,root,root) %{_libdir}/modules.gatos/dri/radeon_dri.o
%endif
%endif
%endif
%ifnarch sparc sparc64 ppc
-%files driver-tdfx
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
-%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
-%{_mandir}/man4/tdfx*
+%{!?_without_tdfx:%files driver-tdfx}
+%{!?_without_tdfx:%defattr(644,root,root,755)}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
+%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
%endif
%ifnarch sparc sparc64 ppc
%attr(755,root,root) %{_libdir}/X11/xserver
%dir /etc/X11/xserver
/etc/X11/xserver/SecurityPolicy
-%{_mandir}/man1/xtr*
+#%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man4/citron*
%{_mandir}/man4/dmc.4*
%{_mandir}/man1/xlogo.1*
%{_mandir}/man1/oclock.1*
%{_mandir}/man1/rman.1*
-%{_mandir}/man1/xtrap.1*
+%{_mandir}/man1/xtr*
%{_mandir}/man1/texteroids.1*
%lang(it) %{_mandir}/it/man1/xload.1*
%{_libdir}/X11/app-defaults/Xditview-chrtr
%{_applnkdir}/Utilities/xclipboard.desktop
+%{_applnkdir}/Utilities/oclock.desktop
+%{_applnkdir}/Utilities/xclock.desktop
+%{_applnkdir}/Editors/xedit.desktop
+%{_applnkdir}/Amusements/xeyes.desktop
%files -n imake
%defattr(644,root,root,755)
projects / packages / XFree86.git / blobdiff