# TODO:
# - separate XFS to be standalone - is it possible without duplicated files?
-# - there should be imake and XFree86-devel BuildRequires but it's a little
-# strange idea. It's waiting for the right way execution (c) wrobell ;)
#
# 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.12.1
-
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(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
Version: 4.3.99.902
-Release: 0.1
+Release: 4
Epoch: 1
License: MIT
Group: X11/XFree86
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: 7106431c76d363f11c3cc29d66c19b85
-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
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
-Patch51: %{name}-new-s3-pScreen.patch
+
Patch52: %{name}-kernel_headers.patch
Patch53: %{name}-stdint.patch
-Patch54: %{name}-new-s3-headers.patch
URL: http://www.xfree86.org/
-BuildRequires: %{_bindir}/perl
+BuildRequires: /usr/bin/perl
%ifarch %{ix86} alpha amd64
-%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
+%{?with_tdfx:BuildRequires: Glide3-DRI-devel}
%endif
# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
%ifarch %{ix86} amd64
-%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
+%{?with_tdfx:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
BuildRequires: ed
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.122
+BuildRequires: rpmbuild(macros) >= 1.143
BuildRequires: tcl-devel
-BuildRequires: unzip
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-BuildRequires: imake
-BuildRequires: XFree86-devel
Requires: %{name}-libs = %{epoch}:%{version}
Requires: xauth
Requires: pam >= 0.77.3
%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
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
%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 -p0
-%patch51 -p1
%patch52 -p1
%patch53 -p0
-%patch54 -p1
rm -f xc/config/cf/host.def
# "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="%{_iconsdir}"
-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="%{_iconsdir}"
-
-cd synaptics
-for f in COMPATIBILITY INSTALL NEWS README README.alps TODO; do
- cp -f ${f} ${f}.synaptics
-done
-%endif
-
#--- %install ------------------------
%install
ICONDIR="%{_iconsdir}" \
LINUXDIR="/dev/null"
-%ifnarch sparc sparc64
-install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input
-%endif
-
%ifnarch alpha
#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.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}
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
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}/*
# 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%{_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}} \
%attr(755,root,root) %{_bindir}/smproxy
%attr(755,root,root) %{_bindir}/startx
%attr(755,root,root) %{_bindir}/sxpm
-%ifnarch sparc sparc64 amd64
-%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
%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)
%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} amd64
-%{!?_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*}
+%ifarch %{ix86}
+%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
%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
%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 amd64
-%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
%{_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
-%ifarch %{ix86} amd64
+%ifarch %{ix86}
%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
%{_mandir}/man4/sis*
%endif
%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64
-%{!?_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} alpha arm ppc amd64
-%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
+%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
+%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
+%endif
+%{_mandir}/man4/tdfx*
%endif
-%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
%endif
# Devel: sparc sparc64
%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
%{_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*
projects / packages / XFree86.git / blobdiff