#
# Conditional build:
-# _without_tdfx - disables tdfx drivers building
+%bcond_without tdfx # disables tdfx drivers building
#
-
-%define _sver %(echo %{version} | tr -d .)
-%define _synaptics_ver 0.11.8
-
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(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.3.99.15
-Release: 0.1
+Version: 4.3.99.902
+Release: 4
Epoch: 1
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: ae7ec191348888bc9f83318e55a009e1
+# Source0-md5: eec2d5e4b980ec73a7772b9362ed9021
#Source1: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz
#Source2: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz
Source3: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
Source38: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
# Source38-md5: a184106bb83cb27c6963944d9243ac3f
#Source39: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
-# http://w1.894.telia.com/~u89404340/touchpad/index.html
-Source40: http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-%{_synaptics_ver}.tar.bz2
-# Source40-md5: 48c6e9abc68672d5167f1b699b89005e
-Source41: http://www.linux.org.uk/~alan/S3.zip
-# Source41-md5: 8b754fc6bbded60b683563b945e384b0
+Source40: %{name}-Xserver-headers
+Source41: %{name}-Xserver-headers-links
Source42: twm-xsession.desktop
Source43: xcalc.desktop
Source44: xload.desktop
Source47: xload.png
Source48: xmag.png
Source49: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# Source49-md5: bf9b05a66798796b53ed1a050049b2ee
+# NoSource49-md5: bf9b05a66798796b53ed1a050049b2ee
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch22: %{name}-neomagic_swcursor.patch
Patch23: %{name}-mga-busmstr.patch
Patch24: %{name}-agpgart-load.patch
-Patch25: %{name}-xterm-fix.patch
Patch26: %{name}-HasFreetype2.patch
Patch27: %{name}-config-s3.patch
Patch28: %{name}-sparc_pci_domains.patch
Patch45: %{name}-spencode-nowarning.patch
# Small (maybe buggy) patch to resolve problems with totem 0.97.0
Patch46: %{name}-lock.patch
-Patch47: %{name}-linux-version.patch
-Patch48: %{name}-new-s3-nodebug.patch
+Patch47: %{name}-sparc-kbd.patch
+
Patch49: %{name}-mandir-fix.patch
Patch50: %{name}-xterm-256colors.patch
+
+Patch52: %{name}-kernel_headers.patch
+Patch53: %{name}-stdint.patch
URL: http://www.xfree86.org/
-BuildRequires: %{_bindir}/perl
+BuildRequires: /usr/bin/perl
+%ifarch %{ix86} alpha amd64
+%{?with_tdfx:BuildRequires: Glide3-DRI-devel}
+%endif
+# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
+%ifarch %{ix86} amd64
+%{?with_tdfx:BuildRequires: Glide2x_SDK}
+%endif
BuildRequires: bison
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
+BuildRequires: rpmbuild(macros) >= 1.143
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-%ifarch %{ix86} alpha
-%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
-%endif
-# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86}
-%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
-%endif
Requires: %{name}-libs = %{epoch}:%{version}
Requires: xauth
Requires: pam >= 0.77.3
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
+ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: xpm-progs
Obsoletes: xterm
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
-%define _icondir /usr/share/icons
-%define _pixmapsdir /usr/share/pixmaps
%define _soundsdir /usr/share/sounds
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
+%define _libx11dir %{_prefix}/lib/X11
+%define _appdefsdir %{_libx11dir}/app-defaults
# 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
+# ELF objects with Rendition microcode - disliked by ELF utils
+%define _noautostrip .*\\.uc
+%define _noautochrpath .*\\.uc
+
%description
The X Window System provides the base technology for developing
graphical user interfaces. Simply stated, X draws the elements of the
Summary: Display PostScript
Summary(pl): Display PostScript
Group: X11/XFree86
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: DPS
Obsoletes: dgs
Summary: Header files for Display PostScript
Summary(pl): Pliki nag³ówkowe dla Display PostScript
Group: X11/XFree86
-Requires: %{name}-DPS = %{epoch}:%{version}
+Requires: %{name}-DPS = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Obsoletes: dgs-devel
%description DPS-devel
Summary: Display PostScript static libraries
Summary(pl): Biblioteki statyczne Display PostScript
Group: X11/XFree86
-Requires: %{name}-DPS-devel = %{epoch}:%{version}
+Requires: %{name}-DPS-devel = %{epoch}:%{version}-%{release}
Obsoletes: dgs-static
%description DPS-static
Summary: OpenGL support for X11R6
Summary(pl): Wsparcie OpenGL dla systemu X11R6
Group: X11/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-nvidia
Summary: OpenGL support for X11R6 - GL library
Summary(pl): Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
Group: X11/Libraries
-Requires: XFree86-OpenGL-core = %{epoch}:%{version}
+Requires: XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-driver-firegl
-Conflicts: OpenGL-core < 4.3.99.12
%description OpenGL-libGL
OpenGL support for X11R6 system - GL library.
Summary: OpenGL for X11R6 development
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
Group: X11/Development/Libraries
+Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Requires: OpenGL-devel-base
-Requires: %{name}-OpenGL-libs = %{epoch}:%{version}
-Requires: %{name}-devel
Provides: OpenGL-devel
Obsoletes: Mesa-devel
Obsoletes: XFree86-OpenGL-doc
Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6.
%package OpenGL-devel-base
-Summary: OpenGL for X11R6 development (only gl?.h)
-Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
+Summary: OpenGL for X11R6 development (GL and GLX only)
+Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko GL i GLX)
Group: X11/Development/Libraries
-Requires: OpenGL-devel
-Requires: %{name}-OpenGL-libs = %{epoch}:%{version}
-Requires: %{name}-devel
+Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-devel-base
%description OpenGL-devel-base
-Base headers (only gl?.h) for OpenGL for X11R6.
+Base headers (GL and GLX only) for OpenGL for X11R6.
%description OpenGL-devel-base -l pl
-Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6.
+Podstawowe pliki nag³ówkowe (tylko GL i GLX) OpenGL dla systemu X11R6.
%package OpenGL-libs
Summary: OpenGL libraries for X11R6
Summary(pl): Biblioteki OpenGL dla systemu X11R6
Group: X11/Libraries
-Requires: %{name}-OpenGL-core
-Requires: %{name}-libs = %{epoch}:%{version}
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: OpenGL
-Obsoletes: %{name}-OpenGL
Obsoletes: Mesa
+Obsoletes: XFree86-OpenGL
%description OpenGL-libs
OpenGL libraries for X11R6 system.
Summary: X11R6 static libraries with OpenGL
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
Group: X11/Development/Libraries
-Requires: %{name}-OpenGL-devel = %{epoch}:%{version}
+Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-static
Obsoletes: Mesa-static
Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XFree86
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
Group: X11/XFree86/Servers
-Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-base
+Requires: XFree86-fonts-base
%description Xnest
Xnest is an X Window System server which runs in an X window. Xnest is
Summary(pl): X serwer z rozszerzeniem Xprint
Group: X11/XFree86/Servers
PreReq: xprint-initrc
-Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-base
+Requires: XFree86-fonts-base
%description Xprt
Xprt provides an X server with the print extension and special DDX
Summary(pl): Serwer XFree86
Summary(tr): XFree86 sunucusu
Group: X11/XFree86/Servers
-Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-base
+Requires: XFree86-fonts-base
Requires: pam
Obsoletes: XFree86-Mono
Obsoletes: XFree86-SVGA
Summary(ru): óÅÒ×ÅÒ XFree86 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/XFree86/Servers
-Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: %{name}-fonts-base
+Requires: XFree86-fonts-base
%description Xvfb
Xvfb (X Virtual Frame Buffer) is an X Window System server that is
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
Group: X11/Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}
-Requires: imake = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: imake = %{epoch}:%{version}-%{release}
Provides: xpm-devel
Obsoletes: xpm-devel
%ifarch sparc sparc64
Summary: Header files for XFree86 Xserver drivers/extensions development
Summary(pl): Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera XFree86
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%description Xserver-devel
Header files for XFree86 Xserver drivers and extensions development.
Requires: OpenGL
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
+Conflicts: XFree86-driver-nvidia
%description driver-r128
ATI Rage 128 video driver.
Requires: OpenGL
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: %{name}-driver-ati
+Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
%description driver-radeon
Group: X11/XFree86
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+# dlopens libglide2x.so
+Requires: Glide_VG
%description driver-glide
Voodoo1 and Voodoo2 video driver.
Summary: 3Dfx video driver
Summary(pl): Sterownik do kart 3Dfx
Group: X11/XFree86
-Requires: Glide3-DRI
-Requires: OpenGL
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: XFree86-driver-nvidia
+# dlopens libglide3x.so
+Requires: Glide3-DRI
+Requires: OpenGL
Obsoletes: XFree86-3dfx
+Conflicts: XFree86-driver-nvidia
%description driver-tdfx
3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5.
Requires(post,postun): /sbin/ldconfig
Requires(post,postun): grep
Requires(postun): fileutils
-Requires: %{name}-common = %{epoch}:%{version}
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: xpm
Obsoletes: xpm
Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86
Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86
Group: X11/XFree86
-Requires: %{name}-Xserver = %{epoch}:%{version}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-xf86cfg
%description setup
Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{epoch}:%{version}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
Obsoletes: xpm-static
-#Obsoletes: Mesa-static
%description static
X11R6 static libraries.
Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XFree86
Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
Group: X11/XFree86
-Requires: %{name} >= %{version}
-Requires: %{name}-libs = %{epoch}:%{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: man-config
Obsoletes: X11R6-contrib
ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib.
+%package -n XcursorTheme-handhelds
+Summary: Cursors Theme "handhelds"
+Summary(pl): Motyw kursorów "handhelds"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-handhelds
+Cursors theme "handhelds" for X11.
+
+%description -n XcursorTheme-handhelds -l pl
+Motyw kursorów "handhelds" dla X11.
+
+%package -n XcursorTheme-redglass
+Summary: Cursors theme "redglass"
+Summary(pl): Motyw kursorów "redglass"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-redglass
+Cursors theme "redglass" for X11.
+
+%description -n XcursorTheme-redglass -l pl
+Motyw kursorów "redglass" dla X11.
+
+%package -n XcursorTheme-whiteglass
+Summary: Cursors theme "whiteglass"
+Summary(pl): Motyw kursorów "whiteglass"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-whiteglass
+Cursors theme "whiteglass" for X11.
+
+%description -n XcursorTheme-whiteglass -l pl
+Motyw kursorów "whiteglass" dla X11.
+
%package -n imake
Summary: C preprocessor interface to the make utility
Summary(pl): Miedzymordzie do make oparte o preprocesor C
Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
-Requires: %{name}-libs = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description -n twm
Twm is a window manager for the X Window System. It provides
Summary: xauth - X authority file utility
Summary(pl): xauth - narzêdzie do plików X authority
Group: X11/XFree86
-Requires: %{name}-libs = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%description -n xauth
The xauth program is used to edit and display the authorization
Group: X11/XFree86
PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
-Requires: %{name} = %{epoch}:%{version}
-Requires: %{name}-libs = %{epoch}:%{version}
-Requires: /usr/X11R6/bin/sessreg
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: pam >= 0.71
-Requires: sessreg = %{epoch}:%{version}
+Requires: sessreg = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
Obsoletes: XFree86-xdm
Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
-Requires: %{name}-fonts-base
-Requires: %{name}-libs = %{epoch}:%{version}
-Obsoletes: xfsft XFree86-xfs
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-fonts-base
+Obsoletes: XFree86-xfs
+Obsoletes: xfsft
%description -n xfs
This is a font server for XFree86. You can serve fonts to other X
#--- %prep ---------------------------
%prep
-%setup -q -c -b3 -a40 -a41
+%setup -q -c -b3
#-b1 -b2 -a3
%patch0 -p0
%patch1 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
%patch33 -p1
#%patch34 -p1 -- seems not applied (was partially in rc1??? maybe another fix present?)
#%patch35 -p1 -- obsoleted? (but doesn't look to be applied)
-%{!?_without_tdfx:%patch36 -p0}
+%{?with_tdfx:%patch36 -p0}
#%patch38 -p0 -- causing problems IIRC (but not really needed)
-%{!?_without_tdfx:%patch39 -p0}
+%{?with_tdfx:%patch39 -p0}
%patch40 -p1
%{!?debug:%patch41 -p1}
-%{?_without_tdfx:%patch42 -p0}
+%{!?with_tdfx:%patch42 -p0}
%patch43 -p0
%patch44 -p0
%patch45 -p1
%patch46 -p0
%patch47 -p1
-tar xfz *.tar.gz
-%patch48 -p0
%patch49 -p1
-%patch50 -p1
+%patch50 -p0
+%patch52 -p1
+%patch53 -p0
rm -f xc/config/cf/host.def
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
- LINUXDIR="%{_kernelsrcdir}"
+ ICONDIR="%{_iconsdir}" \
+ LINUXDIR="/dev/null"
%ifnarch alpha
#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
# "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
%endif
-%ifarch %{ix86} mips ppc arm
-olddir=$(pwd)
-cd LinuxDriver/2D
-chmod u+w Imakefile
-echo -e ',s#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g\n,w' | ed Imakefile
-xmkmf $olddir/xc .
-%{__make} -S savage_drv.o \
- DEFAULT_OS_CPU_FROB=%{_target_cpu} \
- CC="%{__cc}" \
- BOOTSTRAPCFLAGS="%{rpmcflags}" \
- CCOPTIONS="%{rpmcflags}" \
- CXXOPTIONS="%{rpmcflags}" \
- CXXDEBUGFLAGS="" \
- CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
- LINUXDIR="%{_kernelsrcdir}"
-cd $olddir
-%endif
-
-%ifnarch sparc sparc64
-TOPDIR=$(pwd)/xc
-%{__make} -S -C synaptics clean all \
- TOP="$TOPDIR" \
- CC="%{__cc}" \
- BOOTSTRAPCFLAGS="%{rpmcflags}" \
- CCOPTIONS="%{rpmcflags}" \
- CXXOPTIONS="%{rpmcflags}" \
- CXXDEBUGFLAGS="" \
- CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
- LINUXDIR="%{_kernelsrcdir}"
-
-cd synaptics
-for f in COMPATIBILITY FEATURES INSTALL NEWS PARAMETER; do
- cp -f ${f} ${f}.synaptics
-done
-%endif
-
#--- %install ------------------------
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
$RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
- $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
+ $RPM_BUILD_ROOT%{_appdefsdir}/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
$RPM_BUILD_ROOT%{_datadir}/misc \
$RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
- $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}/mini} \
+ $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir}/mini,%{_pixmapsdir}/mini} \
$RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
- $RPM_BUILD_ROOT%{_xsessdir}
+ $RPM_BUILD_ROOT%{_xsessdir} \
+ $RPM_BUILD_ROOT%{_pkgconfigdir}
%{__make} -C xc install install.man \
DESTDIR="$RPM_BUILD_ROOT" \
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
- LINUXDIR="%{_kernelsrcdir}"
-
-%ifnarch sparc sparc64
-install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input
-%endif
+ ICONDIR="%{_iconsdir}" \
+ LINUXDIR="/dev/null"
%ifnarch alpha
#install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
%endif
-%ifarch %{ix86} mips ppc arm
-install -d $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers
-install LinuxDriver/2D/savage_drv.o $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers
-%endif
+# fix pkgconfig path
+if [ "%{_pkgconfigdir}" != "/usr/lib/pkgconfig" ] ; then
+ mv $RPM_BUILD_ROOT/usr/lib/pkgconfig/* $RPM_BUILD_ROOT%{_pkgconfigdir}
+fi
# setting default X
rm -f $RPM_BUILD_ROOT%{_bindir}/X
# add X11 links in /usr/bin, /usr/lib /usr/include
ln -sf %{_includedir}/X11 $RPM_BUILD_ROOT/usr/include/X11
-ln -sf %{_libdir}/X11 $RPM_BUILD_ROOT/usr/lib/X11
+ln -sf %{_libx11dir} $RPM_BUILD_ROOT/usr/lib/X11
ln -sf %{_bindir} $RPM_BUILD_ROOT/usr/bin/X11
# fix libGL*.so links
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so
+# according to OpenGL ABI for Linux v1.0
+# (http://oss.sgi.com/projects/ogl-sample/ABI/index.html)
+# libGL.so.1, libGL.so, libGLU.so.1, libGL.so must be accessible in /usr
+# libGL is already linked by XFree86 build, but libGLU not
+ln -sf %{_libdir}/libGLU.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGLU.so.1
+ln -sf %{_libdir}/libGLU.so $RPM_BUILD_ROOT/usr/%{_lib}/libGLU.so
+
+# move instead of symlinking
+rm -f $RPM_BUILD_ROOT/usr/include/GL
+mv -f $RPM_BUILD_ROOT%{_includedir}/GL $RPM_BUILD_ROOT/usr/include
+
# get the most current OpenGL extensions
-rm -f $RPM_BUILD_ROOT%{_includedir}/GL/glext.h
-cp %{SOURCE49} $RPM_BUILD_ROOT%{_includedir}/GL/glext.h
-
-# collect Xserver headers
-install -d $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
-cd xc/programs/Xserver
-# don't change to single install - there are symlinked "duplicates"
-install include/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
-install hw/xfree86/{common,os-support}/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+cp -f %{SOURCE49} $RPM_BUILD_ROOT/usr/include/GL/glext.h
+
+# don't include shared version due to Motif issues
+rm -f $RPM_BUILD_ROOT%{_libdir}/libGLw.so*
+
+# collect Xserver headers and make symlinks
+for f in `cat %{SOURCE40}`; do
+ install -D xc/${f} $RPM_BUILD_ROOT%{_includedir}/X11/Xserver/${f}
+done
+cd $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+sh %{SOURCE41}
cd -
# set up PLD xdm config
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 %{SOURCE9} $RPM_BUILD_ROOT%{_appdefsdir}/pl/XTerm
install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm
install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
:> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
:> $RPM_BUILD_ROOT/etc/security/blacklist.xdm
-ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libdir}/X11/fonts
+ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libx11dir}/fonts
# do not duplicate xkbcomp program
-rm -f $RPM_BUILD_ROOT%{_libdir}/X11/xkb/xkbcomp
+rm -f $RPM_BUILD_ROOT%{_libx11dir}/xkb/xkbcomp
ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp
-ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libdir}/X11/doc
+ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
-rm -f $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def
+rm -f $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
-:> $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def
+:> $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_sysconfdir}/X11/XF86Config
rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html
# resolve conflict with man-pages
mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
-# fix mkfontscale path
-perl -pi -e "s#mkfontscale#%{_bindir}/mkfontscale#g" $RPM_BUILD_ROOT%{_bindir}/mkfontdir
-
# directories for applications locales
echo '%defattr(644,root,root,755)' > XFree86-libs.lang
for lang in af az bg bg_BG.cp1251 br ca cs da de el en_GB eo es et eu fi \
echo "%lang(${lang}) %{_datadir}/locale/${lang}" >> XFree86-libs.lang
done
-%ifnarch sparc sparc64
-install synaptics/synclient $RPM_BUILD_ROOT%{_bindir}
-install synaptics/*.synaptics $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
-%endif
-
%ifnarch sparc sparc64
gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
%endif
+# kill some stuff for cleaner build
+# (packaged separately, DRM already in kernel)
+rm -rf $RPM_BUILD_ROOT%{_pkgconfigdir}/{xcursor,xft}.pc \
+ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontconfig.pc \
+ $RPM_BUILD_ROOT%{_mandir}/{man3/fontconfig.3x,man1/fc-{cache,list}.1x} \
+ $RPM_BUILD_ROOT%{_libdir}/{libfontconfig.*,libXrender.*,libXcursor.*,libXft.{a,so.2*}} \
+ $RPM_BUILD_ROOT%{_includedir}/{fontconfig,X11/{Xcursor,Xft}} \
+ $RPM_BUILD_ROOT%{_bindir}/{fc-cache,fc-list,xcursor-config,xft-config} \
+ $RPM_BUILD_ROOT/etc/fonts \
+ $RPM_BUILD_ROOT%{_prefix}/src
+
+# skipped from removal - %%exclude is used for these
+# %{_includedir}/X11/extensions/{Xrender.h,render.h,renderproto.h}
+# %{_mandir}/man3/Xft.3x
+
%clean
rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%ifnarch sparc sparc64
%doc %{_docdir}/%{name}-%{version}
-%doc %{_libdir}/X11/doc
-%endif
-
-%{_libdir}/X11/app-defaults/UXTerm
-%{_libdir}/X11/app-defaults/XCalc
-%{_libdir}/X11/app-defaults/XCalc-color
-%{_libdir}/X11/app-defaults/XClipboard
-%{_libdir}/X11/app-defaults/XClock
-%{_libdir}/X11/app-defaults/XClock-color
-%{_libdir}/X11/app-defaults/XLoad
-%{_libdir}/X11/app-defaults/XLogo
-%{_libdir}/X11/app-defaults/XLogo-color
-%{_libdir}/X11/app-defaults/XSm
-%{_libdir}/X11/app-defaults/XTerm
-%lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm
-%{_libdir}/X11/app-defaults/XTerm-color
-%dir %{_icondir}
-%{_icondir}/*
-
-%attr(755,root,root) %{_libdir}/X11/lbxproxy
-%attr(755,root,root) %{_libdir}/X11/proxymngr
-%attr(755,root,root) %{_libdir}/X11/rstart
-%attr(755,root,root) %{_libdir}/X11/fonts
-%attr(755,root,root) %{_libdir}/X11/xinit
-%attr(755,root,root) %{_libdir}/X11/xsm
+%doc %{_libx11dir}/doc
+%endif
+
+%{_appdefsdir}/UXTerm
+%{_appdefsdir}/XCalc
+%{_appdefsdir}/XCalc-color
+%{_appdefsdir}/XClipboard
+%{_appdefsdir}/XClock
+%{_appdefsdir}/XClock-color
+%{_appdefsdir}/XLoad
+%{_appdefsdir}/XLogo
+%{_appdefsdir}/XLogo-color
+%{_appdefsdir}/XSm
+%{_appdefsdir}/XTerm
+%lang(pl) %{_appdefsdir}/pl/XTerm
+%{_appdefsdir}/XTerm-color
+
+%attr(755,root,root) %{_libx11dir}/lbxproxy
+%attr(755,root,root) %{_libx11dir}/proxymngr
+%attr(755,root,root) %{_libx11dir}/rstart
+%attr(755,root,root) %{_libx11dir}/fonts
+%attr(755,root,root) %{_libx11dir}/xinit
+%attr(755,root,root) %{_libx11dir}/xsm
%dir /etc/X11/xinit
%dir /etc/X11/lbxproxy
%dir /etc/X11/xsm
/etc/X11/xsm/*
-%dir %{_libdir}/X11/x11perfcomp
-%attr(755,root,root) %{_libdir}/X11/x11perfcomp/*
+%dir %{_libx11dir}/x11perfcomp
+%attr(755,root,root) %{_libx11dir}/x11perfcomp/*
%attr(755,root,root) %{_bindir}/Xmark
%attr(755,root,root) %{_bindir}/appres
%attr(755,root,root) %{_bindir}/smproxy
%attr(755,root,root) %{_bindir}/startx
%attr(755,root,root) %{_bindir}/sxpm
-%ifnarch sparc sparc64
-%attr(755,root,root) %{_bindir}/synclient
-%endif
%attr(755,root,root) %{_bindir}/uxterm
%attr(755,root,root) %{_bindir}/xcmsdb
%attr(755,root,root) %{_bindir}/xconsole
%{_pixmapsdir}/xlogo64.png
%{_pixmapsdir}/xterm.png
-%{_libdir}/X11/app-defaults/Xvidtune
+%{_appdefsdir}/Xvidtune
%{_mandir}/man1/Xmark.1*
%{_mandir}/man1/appres.1*
/usr/lib/X11
%dir %{_bindir}
%dir %{_libdir}
-%dir %{_libdir}/X11
-%{_libdir}/X11/rgb.txt
+%dir %{_libx11dir}
+%{_libx11dir}/rgb.txt
%files DPS
%defattr(644,root,root,755)
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%attr(755,root,root) %{_libdir}/libGL.so
-%attr(755,root,root) /usr/lib/libGL.so*
+# Linux OpenGL ABI compatibility symlinks
+%attr(755,root,root) /usr/%{_lib}/libGL.so.1
+%attr(755,root,root) /usr/%{_lib}/libGL.so
%files OpenGL-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libGLU.so
-%attr(755,root,root) %{_libdir}/libOSMesa*.so
+%attr(755,root,root) %{_libdir}/libOSMesa.so
+# Linux OpenGL ABI compatibility symlink
+%attr(755,root,root) /usr/%{_lib}/libGLU.so
%{_libdir}/libGLw.a
-%dir %{_includedir}/GL
%dir /usr/include/GL
-%attr(644,root,root) %{_includedir}/GL/*
-%exclude %{_includedir}/GL/gl.h
-%exclude %{_includedir}/GL/glx.h
-%exclude %{_includedir}/GL/glxtokens.h
+/usr/include/GL/GLwDrawA.h
+/usr/include/GL/GLwDrawAP.h
+/usr/include/GL/GLwMDrawA.h
+/usr/include/GL/GLwMDrawAP.h
+/usr/include/GL/glu.h
+/usr/include/GL/glxext.h
+/usr/include/GL/glxint.h
+/usr/include/GL/glxmd.h
+/usr/include/GL/glxproto.h
+/usr/include/GL/osmesa.h
%{_mandir}/man3/gl[A-Z]*
%{_mandir}/man3/glu*
%{_mandir}/man3/GLw*
%files OpenGL-devel-base
%defattr(644,root,root,755)
-%{_includedir}/GL/gl.h
-%{_includedir}/GL/glx.h
-%{_includedir}/GL/glxtokens.h
+/usr/include/GL/gl.h
+/usr/include/GL/glx.h
+/usr/include/GL/glext.h
+/usr/include/GL/glxtokens.h
%files OpenGL-libs
%defattr(644,root,root,755)
# to be fixed: it contains unresolved symbols and would need -lXm
#%attr(755,root,root) %{_libdir}/libGLw.so.*.*
%attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
+# Linux OpenGL ABI compatibility symlink
+%attr(755,root,root) /usr/%{_lib}/libGLU.so.1
%{_mandir}/man1/glxinfo.1*
%files OpenGL-static
%defattr(644,root,root,755)
%{_libdir}/libGL.a
%{_libdir}/libGLU.a
-%{_libdir}/libOSMesa*.a
+%{_libdir}/libOSMesa.a
%files Xnest
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/X
%{_mandir}/man1/XFree86.1*
%{_mandir}/man1/Xserver.1*
+%{_mandir}/man1/getconfig.1*
%{_mandir}/man5/XF86Config.5*
+%{_mandir}/man5/getconfig.5*
-%{_libdir}/X11/Cards
-%{_libdir}/X11/Options
+%{_libx11dir}/Cards
+%{_libx11dir}/Options
+%{_libx11dir}/getconfig
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/XF86Config
%attr(640,root,root) %config %verify(not md5 size mtime) /etc/pam.d/xserver
%{_includedir}/X11/extensions/*.h
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
-%{_libdir}/X11/config
+%{_libx11dir}/config
%exclude %{_includedir}/X11/extensions/Xrender.h
%exclude %{_includedir}/X11/extensions/render.h
%{_includedir}/X11/Xserver
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} amd64
%files driver-apm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} amd64
%files driver-ark
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm
+%ifarch %{ix86} mips ppc arm amd64
%files driver-chips
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha
+%ifarch %{ix86} alpha amd64
%files driver-cirrus
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
%{_mandir}/man4/cirrus*
%endif
-%ifarch %{ix86}
+%ifarch %{ix86} amd64
%files driver-cyrix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
%{_mandir}/man4/cyrix*
%endif
-%ifarch %{ix86} sparc sparc64 mips ppc arm superh
+%ifarch %{ix86} sparc sparc64 mips ppc arm superh amd64
%files driver-fbdev
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
-%{_mandir}/man4/fbdev*
+%{_mandir}/man4/fbdev.4*
%endif
%ifarch %{ix86}
-%{!?_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*}
+%if %{with tdfx}
+%files driver-glide
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
+%{_mandir}/man4/glide*
+%endif
%endif
%files driver-glint
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifarch %{ix86} alpha ppc arm
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
%{_mandir}/man4/glint*
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} amd64
%files driver-i128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
%{_mandir}/man4/i810*
%endif
-# Devel: %{ix86} sparc sparc64 ppc
+# Devel: %{ix86} sparc sparc64 ppc amd64
%if 0
%files driver-imstt
%defattr(644,root,root,755)
%{_mandir}/man4/imstt.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha ppc arm
+%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64
%files driver-mga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
-%ifarch %{ix86} alpha ppc arm
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
%endif
%{_mandir}/man4/mga*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} amd64
%files driver-neomagic
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
%{_mandir}/man4/neomagic*
%endif
-# Devel: %{ix86} sparc sparc64
+# Devel: %{ix86} sparc sparc64 amd64
%ifarch mips
%files driver-newport
%defattr(644,root,root,755)
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha arm ppc
+%ifarch %{ix86} mips alpha arm ppc amd64
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
%files driver-r128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifarch %{ix86} alpha ppc arm
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
%{_mandir}/man4/r128*
%files driver-radeon
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifarch %{ix86} alpha ppc arm
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
%endif
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha
+%ifarch %{ix86} alpha amd64
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
+%{_libdir}/modules/*.uc
%{_mandir}/man4/rendition*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm
+%ifarch %{ix86} mips alpha ppc arm amd64
%files driver-s3virge
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
%{_mandir}/man4/s3virge*
%endif
-%ifarch %{ix86} mips alpha ppc arm
+%ifarch %{ix86} mips alpha ppc arm amd64
%files driver-s3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm
+%ifarch %{ix86} mips alpha ppc arm amd64
%files driver-savage
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
-%ifarch %{ix86} mips ppc arm
-%dir %{_libdir}/modules.s3
-%dir %{_libdir}/modules.s3/drivers
-%attr(755,root,root) %{_libdir}/modules.s3/drivers/savage_drv.o
-%endif
%{_mandir}/man4/savage*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha
+%ifarch %{ix86} alpha amd64
%files driver-siliconmotion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
%{_mandir}/man4/siliconmotion*
%endif
-%ifarch %{ix86} mips ppc arm
+%ifarch %{ix86} mips ppc arm amd64
%files driver-sis
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
%{_mandir}/man4/suntcx*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha arm ppc
-%{!?_without_tdfx:%files driver-tdfx}
-%{!?_without_tdfx:%defattr(644,root,root,755)}
-%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o}
+%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64
+%if %{with tdfx}
+%files driver-tdfx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
%ifarch %{ix86} alpha arm ppc
-%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
+%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
+%endif
+%{_mandir}/man4/tdfx*
%endif
-%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha
+%ifarch %{ix86} alpha amd64
%files driver-tga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm
+%ifarch %{ix86} mips ppc arm amd64
%files driver-trident
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
%{_mandir}/man4/trident*
%endif
-%ifarch %{ix86}
+%ifarch %{ix86} amd64
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
%dir %{_themesdir}
%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
-%{_libdir}/X11/XErrorDB
-%{_libdir}/X11/XKeysymDB
-%dir %{_libdir}/X11/app-defaults
-%lang(cs) %dir %{_libdir}/X11/app-defaults/cs
-%lang(da) %dir %{_libdir}/X11/app-defaults/da
-%lang(de) %dir %{_libdir}/X11/app-defaults/de
-%lang(es) %dir %{_libdir}/X11/app-defaults/es
-%lang(fr) %dir %{_libdir}/X11/app-defaults/fr
-%lang(hu) %dir %{_libdir}/X11/app-defaults/hu
-%lang(ko) %dir %{_libdir}/X11/app-defaults/ko
-%lang(nl) %dir %{_libdir}/X11/app-defaults/nl
-%lang(pl) %dir %{_libdir}/X11/app-defaults/pl
-%lang(pt) %dir %{_libdir}/X11/app-defaults/pt
-%lang(ru) %dir %{_libdir}/X11/app-defaults/ru
-%lang(sk) %dir %{_libdir}/X11/app-defaults/sk
-%lang(zh_CN) %dir %{_libdir}/X11/app-defaults/zh_CN.gb2312
-%lang(zh_TW) %dir %{_libdir}/X11/app-defaults/zh_TW.big5
-%{_libdir}/X11/locale
+%{_libx11dir}/XErrorDB
+%{_libx11dir}/XKeysymDB
+%dir %{_appdefsdir}
+%lang(cs) %dir %{_appdefsdir}/cs
+%lang(da) %dir %{_appdefsdir}/da
+%lang(de) %dir %{_appdefsdir}/de
+%lang(es) %dir %{_appdefsdir}/es
+%lang(fr) %dir %{_appdefsdir}/fr
+%lang(hu) %dir %{_appdefsdir}/hu
+%lang(ko) %dir %{_appdefsdir}/ko
+%lang(nl) %dir %{_appdefsdir}/nl
+%lang(pl) %dir %{_appdefsdir}/pl
+%lang(pt) %dir %{_appdefsdir}/pt
+%lang(ru) %dir %{_appdefsdir}/ru
+%lang(sk) %dir %{_appdefsdir}/sk
+%lang(zh_CN) %dir %{_appdefsdir}/zh_CN.gb2312
+%lang(zh_TW) %dir %{_appdefsdir}/zh_TW.big5
+%{_libx11dir}/locale
%dir %{_includedir}
%dir %{_includedir}/X11
/usr/include/X11
%dir %{_sbindir}
%dir %{_datadir}/locale
%dir %{_datadir}/misc
+%dir %{_iconsdir}
+%dir %{_iconsdir}/mini
%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
%dir %{_soundsdir}
%files modules
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xkbcomp
-%{_libdir}/X11/xkb
+%{_libx11dir}/xkb
%{_sysconfdir}/X11/xkb
/var/lib/xkb
%dir %{_libdir}/modules
%dir %{_libdir}/modules/dri
%dir %{_libdir}/modules/drivers
-%ifnarch sparc sparc64 ppc
-%{_libdir}/modules/*.uc
-%endif
%attr(755,root,root) %{_libdir}/modules/*.a
%attr(755,root,root) %{_libdir}/modules/codeconv
+%ifnarch amd64
%attr(755,root,root) %{_libdir}/modules/drivers/linux
-%ifarch %{ix86} sparc sparc64 alpha ppc arm
+%endif
+%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
%endif
-%ifarch %{ix86} sparc sparc64
+%ifarch %{ix86} sparc sparc64 amd64
%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%dir %{_libdir}/modules/extensions
%attr(755,root,root) %{_libdir}/modules/fonts
%attr(755,root,root) %{_libdir}/modules/input
%attr(755,root,root) %{_libdir}/modules/linux
-%attr(755,root,root) %{_libdir}/X11/xserver
+%attr(755,root,root) %{_libx11dir}/xserver
%dir /etc/X11/xserver
/etc/X11/xserver/SecurityPolicy
#%%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
+%{_mandir}/man4/aiptek.4*
%{_mandir}/man4/citron*
%{_mandir}/man4/dmc.4*
%{_mandir}/man4/dynapro*
+%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man4/fpit.4*
%{_mandir}/man4/js_x.4*
%{_mandir}/man4/kbd.4*
%{_mandir}/man4/palmax.4*
%{_mandir}/man4/penmount.4*
%{_mandir}/man4/tek4957.4*
+%{_mandir}/man4/ur98.4*
+%ifnarch amd64
%{_mandir}/man4/v4l*
-%ifarch %{ix86} sparc sparc64 alpha ppc arm
+%endif
+%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
%{_mandir}/man4/vga*
%endif
-%ifarch %{ix86} sparc sparc64
+%ifarch %{ix86} sparc sparc64 amd64
%{_mandir}/man4/vesa*
%endif
%{_mandir}/man4/void*
%endif
%attr(755,root,root) %{_bindir}/xf86cfg
%attr(755,root,root) %{_bindir}/xf86config
-%{_libdir}/X11/app-defaults/XF86Cfg
+%{_appdefsdir}/XF86Cfg
%ifnarch ppc
%{_mandir}/man1/scanpci.1*
%endif
%attr(755,root,root) %{_bindir}/rman
%attr(755,root,root) %{_bindir}/xtrap*
%attr(755,root,root) %{_bindir}/texteroids
-%{_libdir}/X11/xedit
-%{_libdir}/X11/xman.help
+%{_libx11dir}/xedit
+%{_libx11dir}/xman.help
%{_mandir}/man1/beforelight.1*
%{_mandir}/man1/ico.1*
%{_mandir}/man1/listres.1*
%lang(pl) %{_mandir}/pl/man1/rman.1*
-%{_libdir}/X11/app-defaults/Beforelight
-%{_libdir}/X11/app-defaults/Bitmap
-%{_libdir}/X11/app-defaults/Bitmap-color
-%{_libdir}/X11/app-defaults/Clock-color
-%{_libdir}/X11/app-defaults/Editres
-%{_libdir}/X11/app-defaults/Editres-color
-%{_libdir}/X11/app-defaults/Viewres
-%{_libdir}/X11/app-defaults/XConsole
-%{_libdir}/X11/app-defaults/Xedit
-%{_libdir}/X11/app-defaults/Xedit-color
-%{_libdir}/X11/app-defaults/Xfd
-%{_libdir}/X11/app-defaults/Xgc
-%{_libdir}/X11/app-defaults/Xmag
-%{_libdir}/X11/app-defaults/Xman
-%{_libdir}/X11/app-defaults/Xmessage
-%{_libdir}/X11/app-defaults/Xmessage-color
-%{_libdir}/X11/app-defaults/Xmh
-%{_libdir}/X11/app-defaults/XFontSel
-%{_libdir}/X11/app-defaults/Xditview
-%{_libdir}/X11/app-defaults/Xditview-chrtr
+%{_appdefsdir}/Beforelight
+%{_appdefsdir}/Bitmap
+%{_appdefsdir}/Bitmap-color
+%{_appdefsdir}/Clock-color
+%{_appdefsdir}/Editres
+%{_appdefsdir}/Editres-color
+%{_appdefsdir}/Viewres
+%{_appdefsdir}/XConsole
+%{_appdefsdir}/Xedit
+%{_appdefsdir}/Xedit-color
+%{_appdefsdir}/Xfd
+%{_appdefsdir}/Xgc
+%{_appdefsdir}/Xmag
+%{_appdefsdir}/Xman
+%{_appdefsdir}/Xmessage
+%{_appdefsdir}/Xmessage-color
+%{_appdefsdir}/Xmh
+%{_appdefsdir}/XFontSel
+%{_appdefsdir}/Xditview
+%{_appdefsdir}/Xditview-chrtr
%{_desktopdir}/oclock.desktop
%{_desktopdir}/xcalc.desktop
%{_pixmapsdir}/xload.png
%{_pixmapsdir}/xmag.png
+%files -n XcursorTheme-handhelds
+%defattr(644,root,root,755)
+%{_iconsdir}/handhelds
+
+%files -n XcursorTheme-redglass
+%defattr(644,root,root,755)
+%{_iconsdir}/redglass
+
+%files -n XcursorTheme-whiteglass
+%defattr(644,root,root,755)
+%{_iconsdir}/whiteglass
+
%files -n imake
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ccmakedep
%attr(755,root,root) %{_bindir}/twm
%dir %{_sysconfdir}/X11/twm
%config %{_sysconfdir}/X11/twm/system.twmrc
-%attr(755,root,root) %{_libdir}/X11/twm
+%attr(755,root,root) %{_libx11dir}/twm
%{_mandir}/man1/twm.1*
%files -n xauth
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm
/var/lib/xdm
-%{_libdir}/X11/app-defaults/Chooser
+%{_appdefsdir}/Chooser
-%attr(755,root,root) %{_libdir}/X11/xdm
+%attr(755,root,root) %{_libx11dir}/xdm
%attr(755,root,root) %{_bindir}/xdm
%attr(755,root,root) %{_bindir}/chooser
-%ifarch alpha
-%attr(755,root,root) %{_libdir}/libXdmGreet.so*
-%endif
%{_mandir}/man1/xdm.1*
%dir /etc/X11/xdm
%attr(754,root,root) /etc/rc.d/init.d/xfs
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xfs
%dir %{_sysconfdir}/X11/fs
-%attr(755,root,root) %{_libdir}/X11/fs
+%attr(755,root,root) %{_libx11dir}/fs
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config
%attr(755,root,root) %{_bindir}/xfs
projects / packages / XFree86.git / blobdiff