#
# Conditional build:
%bcond_without glide # don't build glide driver
-
-#http://cambuca.ldhs.cetuc.puc-rio.br/multiuser/
+%bcond_without r300 # r300_dri.so
%bcond_with dualhead # apply dualhead patch
-%bcond_with r300 # experimental ati r300 and newer 3D support
- # see r300.sf.net or details
Summary: XOrg X11 Window System servers and basic programs
Summary(de): XOrg X11 Window-System-Server und grundlegende Programme
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: X11
-Version: 6.8.2
-Release: 7
+Version: 6.9.0
+Release: 8
Epoch: 1
License: MIT/X Consortium/BSD (see README)
Group: X11
Source0: ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src1.tar.gz
-# Source0-md5: a9cfa54ae2e65a057b9c6416befeb6ab
+# Source0-md5: 9cd255a090e81e2c62637122794e6150
Source1: ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src2.tar.gz
-# Source1-md5: b6f011b3131e442b8dab85d443d9a56f
+# Source1-md5: f49a0993d89038a46556720688450479
Source2: ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src3.tar.gz
-# Source2-md5: 057d20af30569434e2c6693c1ca66e57
+# Source2-md5: 4d5450bde835270632e004b25e45ef33
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source8: xdm.pamd
Source51: xload.png
Source52: xmag.png
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: b3e8590b46dbab4341841592147fba26
+Source54: XvMCConfig
+# NoSource53-md5: 0c40bd4545aa630e139043c2b12f0807
+Patch0: http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-geteuid.diff
Patch1: %{name}-PLD.patch
Patch2: %{name}-enableglide.patch
Patch3: %{name}-DisableDebug.patch
Patch18: %{name}-XTerm.ad.patch
Patch19: %{name}-llh.patch
Patch20: XFree86-xman-manpaths.patch
-Patch21: XFree86-clearrts.patch
+Patch21: %{name}-clearrts.patch
Patch22: XFree86-Xfont-Type1-large-DoS.patch
Patch23: %{name}-GLcore-strip-a-workaround.patch
Patch24: %{name}-pkgconfig.patch
Patch25: XFree86-spencode-nowarning.patch
Patch26: %{name}-xterm-256colors.patch
Patch27: %{name}-makefile-fastbuild.patch
+Patch28: %{name}-dri-ffb-compile.patch
Patch29: %{name}-radeon-entervt.patch
+Patch30: %{name}-acpi_event_loop_fix.patch
# updated from http://dl.sourceforge.net/i810fb/i810fb-xfree86-420.tar.bz2 : i810fb-xfree420.diff
Patch31: %{name}-i810fb.patch
-Patch33: p_i810dri-memfix.diff
-# http://lists.freedesktop.org/pipermail/xorg/2005-February/006126.html
-Patch34: %{name}-radeon.patch
-Patch35: %{name}-xft_memfree.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=4320
+Patch32: %{name}-compositefastpath.patch
Patch50: %{name}-glibc-locale_sync.patch
Patch60: %{name}-oldkeyb.patch
Patch61: %{name}-sparc64-asmfix.patch
Patch62: %{name}-sparc64-v9fix.patch
Patch63: %{name}-pci-build.patch
-Patch64: %{name}-logitech-ultrax-keyboard.patch
# XFree86-tdfx-fix-vtswitch-font-corruption.patch - issue still not fixed,
# but patch doesn't help either; however, it occurs in text mode only, not
# with tdfxfb, which is worth using anyway
+# radeon
+Patch69: %{name}-radeon-dynamic-clocks.patch
+Patch71: %{name}-radeon-set-fb-location.patch
+Patch72: http://glen.alkohol.ee/xkb/xorg.patch
+Patch73: %{name}-r300.patch
+Patch74: %{name}-unichrome.patch
+
#head-patch
#ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
Patch100: ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/xorg-x11-6.8.1-dualhead.patch
-Patch101: %{name}-gcc4.patch
-Patch102: %{name}-r300.patch
URL: http://www.x.org/
BuildRequires: /usr/bin/perl
%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
+BuildRequires: cpp
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: utempter-devel
BuildRequires: zlib-devel
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-xauth = %{epoch}:%{version}-%{release}
Requires: pam >= 0.79.0
Provides: XFree86 = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86
Obsoletes: xpm-progs
Obsoletes: xterm
-Obsoletes: XFree86
# for /usr/X11R6/bin/mkfontdir
Obsoletes: XFree86-font-utils
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1
%endif
-ExclusiveArch: %{ix86} alpha %{x8664} armv4l ia64 m68k ppc sparc sparc64
+ExclusiveArch: %{ix86} %{x8664} alpha armv4l ia64 m68k ppc sparc sparc64 sparcv9
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _prefix /usr/X11R6
%package OpenGL-core
Summary: OpenGL support extension modules for Xserver
Summary(pl): Modu³y rozszerzeñ X serwera obs³uguj±ce OpenGL
-Group: X11/Xserver
+Group: X11/Servers
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Provides: XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-OpenGL-core
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-OpenGL-libGL
Obsoletes: X11-driver-firegl
Obsoletes: X11-driver-nvidia
+Obsoletes: XFree86-Mesa-libGL
+Obsoletes: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-firegl
Obsoletes: XFree86-driver-nvidia
Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Requires: OpenGL-devel-base
-Provides: OpenGL-devel = 1.5
Provides: OpenGL-GLU-devel = 1.3
Provides: OpenGL-GLX-devel = 1.4
+Provides: OpenGL-devel = 1.5
Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
Obsoletes: Mesa-devel
Obsoletes: XFree86-OpenGL-devel
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
-Provides: OpenGL-static = 1.5
Provides: OpenGL-GLU-static = 1.3
+Provides: OpenGL-static = 1.5
Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
Obsoletes: Mesa-static
Obsoletes: XFree86-OpenGL-static
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XOrg X11
Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: X11-fonts-base
Provides: XFree86-Xnest = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Xnest
Summary: X print server
Summary(pl): X serwer z rozszerzeniem Xprint
Group: X11/Servers
-PreReq: xprint-initrc
Requires: %{name}-Xprint = %{epoch}:%{version}-%{release}
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: X11-fonts-base
+Requires: xprint-initrc
Provides: XFree86-Xprt = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Xprt
Group: X11/Servers
Requires(pre): sed >= 4.0
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: X11-fonts-base
Requires: pam >= 0.79.0
Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-Xserver
Obsoletes: XFree86-Mono
Obsoletes: XFree86-SVGA
Obsoletes: XFree86-VGA16
Obsoletes: XFree86-Sun
Obsoletes: XFree86-Sun24
# still not supported in 4.2.0:
-#Obsoletes: XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
+#Obsoletes: XFree86-8514
+#Obsoletes: XFree86-AGX
+#Obsoletes: XFree86-Mach8
+#Obsoletes: XFree86-P9000
# (and many drivers from XF86_SVGA server... and some from others)
Obsoletes: XFree86-XF86Setup
+Obsoletes: XFree86-Xserver
Obsoletes: Xconfigurator
%description Xserver
drivers for VGA and VESA-compliant cards (without acceleration). Other
drivers can be found in X11-driver-* packages.
-%description Xserver -l de
-X-Server für die elementarsten Framebuffer-SVGA-Geräte, einschließlich
-Karten, die aus ET4000-Chips, Cirrus Logic-Chips, Chips and
-Technologies Laptop-Chips sowie Trident 8900 und 9000 Chips gebaut
-sind. Funktioniert mit Diamond Speedstar, Orchid Kelvins, STB Nitros
-und Horizons, Genoa 8500VL, den meisten Actix-Karten sowie Spider VLB
-Plus und außerdem mit vielen anderen Chips und Karten. Es lohnt sich,
-diesen Server auszuprobieren, wenn Sie Probleme haben.
-
-%description Xserver -l fr
-Serveur X pour les circuits SVGA les plus simples, dont les cartes
-construites avec les circuits ET4000, Cirrus Logic, Chips and
-Technologies laptop, Trident 8900 et 9000. Fonctionne pour les cartes
-Diamond Speedstar, Orchid Kelvins, STB Nitros et Horizons, Genoa
-8500VL, la plupart des Actix et la Spider VLB Plus. Fonctionne aussi
-pour de nombreux autres circuits et cartes. Essayez ce serveur si vous
-avez des problèmes.
-
%description Xserver -l pl
Jest to podstawowy X serwer wy¶wietlaj±cy obraz na karcie graficznej.
Do dzia³ania wymaga odpowiedniego sterownika - sam pakiet zawiera
tylko odpowiedni dla kart VGA oraz SVGA zgodnych z VESA (bez
akceleracji). Inne sterowniki mo¿na znale¼æ w pakietach X11-driver-*.
-%description Xserver -l tr
-ET4000, Cirrus Logic, Chips and Technologies dizüstü, Trident 8900 ve
-9000 gibi basit 'framebuffer' SVGA kullananan kartlar için X sunucusu.
-Ayný zamanda Diamond Speedstar, Orchid Kelvins, STB Nitros / Horizons,
-Genoa 8500VL, çoðu Actix kartlarý, Spider VLB Plus gibi kartlar ve
-birçok diðer kart ile de çalýþýr. Herhangi bir sorun yaþarsanýz bu
-sunucuyu deneyin.
-
%package Xvfb
Summary: XOrg X11 Xvfb server
Summary(pl): Serwer XOrg X11 Xvfb
Summary(uk): óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: X11-fonts-base
Provides: XFree86-Xvfb = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Xvfb
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
Group: X11/Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-imake = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: fontconfig-devel >= 1:2.2.0
Provides: XFree86-devel = %{epoch}:%{version}-%{release}
+Provides: libXvMCW-devel
Provides: render = 0.8
Provides: xcursor-devel = 1.1.2
Provides: xft-devel = 2.1.6
#Provides: libXdamage-devel
#Provides: libXfixes-devel
#Provides: libXrender-devel
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-devel
%endif
Obsoletes: XFree86-devel
Obsoletes: XFree86-xft2-devel
Obsoletes: XFree86-xrender-devel
Obsoletes: Xft-devel
+Obsoletes: libXvMCW-devel
Obsoletes: render
Obsoletes: xcursor-devel
Obsoletes: xft-devel
Summary(pl): Sterownik do kart ATI
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-driver-i2c = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ATI
Obsoletes: XFree86-Mach32
Summary(pl): Sterownik do kart ATI Radeon
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
# for dri
Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
%description driver-i128 -l pl
Sterownik do kart Number 9 I128.
+%package driver-i2c
+Summary: I2C drivers
+Summary(pl): Sterowniki I2C
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-i2c
+I2C drivers.
+
+%description driver-i2c -l pl
+Sterowniki I2C.
+
%package driver-i740
Summary: Intel i740 video driver
Summary(pl): Sterownik do kart na uk³adzie Intel i740
%description driver-sis -l pl
Sterownik do kart na uk³adach SiS.
+%package driver-sisusb
+Summary: Video driver for SiS video chips connected via a Net2280-based USB dongle
+Summary(pl): Sterownik obrazu dla uk³adów SiS pod³±czonych poprzez przej¶ciówkê USB Net2280
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-sisusb
+Video driver for SiS video chips connected via a Net2280-based USB
+dongle. It supports SiS315E/PRO video chipset.
+
+Note: it requires a Linux kernel driver (included in Linux 2.6.12 and
+later).
+
+%description driver-sisusb -l pl
+Sterownik obrazu dla uk³adów SiS pod³±czonych poprzez przej¶ciówkê USB
+opart± na uk³adzie Net2280. Obs³uguje uk³ad graficzny SiS315E/PRO.
+
+Uwaga: wymaga sterownika j±dra Linuksa (za³±czonego w wersji Linuksa
+2.6.12 i pó¼niejszych).
+
%package driver-sunbw2
Summary: sunbw2 - Sun BW2 video driver
Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie
Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
Group: X11/Libraries
Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): grep
-Requires(postun): fileutils
+Requires(triggerpostun): sed >= 4.0
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: glibc >= 6:2.3.5-7.6
Provides: XFree86-libs = %{epoch}:%{version}-%{release}
-Provides: xcursor = 1.1.2
-Provides: xft = 2.1.6
-Provides: xpm
-Provides: xrender = 0.8.4
#Provides: libXcomposite
#Provides: libXdamage
#Provides: libXfixes
#Provides: libXrender
-%ifarch sparc sparc64
+Provides: libXvMCW
+Provides: xcursor = 1.1.2
+Provides: xft = 2.1.6
+Provides: xpm
+Provides: xrender = 0.8.4
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-libs
%endif
Obsoletes: XFree86-libs
Obsoletes: XFree86-xft2
Obsoletes: XFree86-xrender
Obsoletes: Xft
+Obsoletes: libXvMCW
Obsoletes: xcursor
Obsoletes: xft
+Obsoletes: xorg-x11-libs-data
Obsoletes: xpm
Obsoletes: xrender
Provides: xft-static = 2.1.6
Provides: xpm-static
Provides: xrender-static = 0.8.4
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-devel
%endif
Obsoletes: XFree86-static
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
Group: X11
-PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: pam >= 0.79.0
Requires: %{name}-sessreg = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/bin/sessreg
+Requires: pam >= 0.79.0
+Requires: rc-scripts
Provides: XDM
Provides: xdm = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-xdm
Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Group: X11
-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
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: X11-fonts-base
+Requires: rc-scripts
Provides: group(xfs)
Provides: user(xfs)
Provides: xfs = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-xfs
Obsoletes: xfs
Obsoletes: xfsft
+Obsoletes: xorg-x11-xfs
%description xfs
This is a font server for XOrg X11. You can serve fonts to other X
%prep
%setup -qc -a1 -a2 -a7
-%patch1 -p0
+cd xc
+%patch0 -p0
+cd ..
+%patch1 -p1
%{?with_glide:%patch2 -p0}
%patch3 -p0
-%patch4 -p0
+%patch4 -p1
%patch5 -p0
%patch6 -p0
%patch7 -p0
%patch16 -p0
%patch17 -p0
%patch18 -p0
-%patch19 -p0
+%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch25 -p1
%patch26 -p0
%patch27 -p0
+%patch28 -p1
rm -f xc/config/cf/host.def
%patch29 -p1
-cd xc
-%patch33 -p0
-cd -
+%patch30 -p0
%patch31 -p0
-%patch34 -p0
-%patch35 -p0
+%patch32 -p0
%patch50 -p1
%patch60 -p0
-%patch61 -p1
+# FIXME
+# %patch61 -p1
%patch62 -p1
%patch63 -p1
-%patch64 -p1
+
+# FIXME, is this still needed?
+# %patch69 -p0
+# FIXME, is this still needed?
+# %patch71 -p0
+%{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
+
+%{?with_r300:%patch73 -p1}
+%{?with_r300:%patch74 -p1}
+# patch74 required patch73
%{?with_dualhead:%patch100 -p1}
-%patch101 -p1
-%{?with_r300:%patch102 -p0}
+
+sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
+ xc/programs/xdm/*.* xc/programs/Xserver/os/*.*
%build
PWD=`pwd`
TOP="$PWD/xc"
%install
-PWD=`pwd`
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{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
+PWD=`pwd`
%{__make} -C xc install install.man \
DESTDIR="$RPM_BUILD_ROOT" \
- DOCDIR="/usr/share/doc/%{name}-%{version}" \
+ DOCDIR="%{_docdir}/%{name}-%{version}" \
INSTBINFLAGS="-m 755" \
INSTPGMFLAGS="-m 755" \
RAWCPP="/lib/cpp" \
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%{_libx11dir}/doc
+ln -sf %{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
rm -f $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
# resolve conflict with man-pages
mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
# help rpm to detect deps
chmod 755 $RPM_BUILD_ROOT%{_libdir}/modules/dri/*.so
-gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
+gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*
# don't gzip README.* files, they are needed by XF86Setup
-gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
+gunzip $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.*
+
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-%{_lib}.conf
+
+chmod -R u+w $RPM_BUILD_ROOT
+
+cp -a %{SOURCE54} $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig
%clean
rm -rf $RPM_BUILD_ROOT
-#--- %post{un}, %preun, %verifyscript, %trigge ----------
+#--- %post{un}, %preun, %trigger ----------
%post DPS -p /sbin/ldconfig
%postun DPS -p /sbin/ldconfig
%post OpenGL-libs -p /sbin/ldconfig
%postun OpenGL-libs -p /sbin/ldconfig
-%post libs
-umask 022
-grep -qs "^%{_libdir}$" /etc/ld.so.conf
-[ $? -ne 0 ] && echo "%{_libdir}" >> /etc/ld.so.conf
-/sbin/ldconfig
-
-%postun libs
-if [ "$1" = "0" ]; then
- umask 022
- grep -v "%{_libdir}" /etc/ld.so.conf > /etc/ld.so.conf.new
- mv -f /etc/ld.so.conf.new /etc/ld.so.conf
-fi
-/sbin/ldconfig
-
-%verifyscript libs
-echo -n "Looking for %{_libdir} in /etc/ld.so.conf... "
-if ! grep -q "^%{_libdir}$" /etc/ld.so.conf ; then
- echo "missing"
- echo "%{_libdir} missing from /etc/ld.so.conf" >&2
-else
- echo "found"
-fi
-
-%triggerpostun libs -- XFree86-libs
-umask 022
-grep -qs "^%{_libdir}$" /etc/ld.so.conf
-[ $? -ne 0 ] && echo "%{_libdir}" >> /etc/ld.so.conf
-/sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%pre modules
if [ -d /etc/X11/xkb/geometry/hp ]; then
ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb
fi
+%triggerpostun libs -- X11-libs < 1:6.8.2-11.13
+sed -i -e "/^%(echo %{_libdir} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
+
%post xdm
/sbin/chkconfig --add xdm
if [ -f /var/lock/subsys/xdm ]; then
- echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+ echo "Run \"/sbin/service 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
+ echo "Run \"/sbin/service xdm start\" to start xdm." >&2
fi
%preun xdm
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/xdm ]; then
- /etc/rc.d/init.d/xdm stop >&2
- fi
/sbin/chkconfig --del xdm
+ %service xdm stop
fi
%pre xfs
%post xfs
/sbin/chkconfig --add xfs
-if [ -f /var/lock/subsys/xfs ]; then
- /etc/rc.d/init.d/xfs restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
-fi
+%service xfs restart "font server"
%preun xfs
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/xfs ]; then
- /etc/rc.d/init.d/xfs stop >&2
- fi
+ %service xfs stop
/sbin/chkconfig --del xfs
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
/sbin/chkconfig --add xfs
-/etc/rc.d/init.d/xfs start >&2
+/sbin/service xfs start >&2
%triggerpostun Xserver -- XFree86-Xserver
if [ -s /etc/X11/XF86Config.rpmsave ]; then
/usr/lib/X11
%dir %{_bindir}
%dir %{_libdir}
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib
+%endif
%dir %{_libx11dir}
%{_libx11dir}/rgb.txt
%files OpenGL-core
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/extensions/libglx.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
+%attr(755,root,root) %{_libdir}/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.so
%files OpenGL-libGL
%defattr(644,root,root,755)
%files Xserver
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Xorg
-%attr(755,root,root) %{_bindir}/Xdmx
+%attr(755,root,root) %{_bindir}/*dmx*
%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/getconfig*
%attr(755,root,root) %{_sysconfdir}/X11/X
%attr(755,root,root) %{_bindir}/X
-%{_mandir}/man1/Xdmx.1*
%{_mandir}/man1/Xorg.1*
%{_mandir}/man1/Xserver.1*
+%{_mandir}/man1/*dmx*.1*
%{_mandir}/man1/getconfig.1*
%{_mandir}/man5/xorg.conf.5*
%{_mandir}/man5/getconfig.5*
+
%{_libx11dir}/Cards
%{_libx11dir}/Options
%{_libx11dir}/getconfig
-%config(missingok,noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/xorg.conf
-%attr(640,root,root) %config %verify(not md5 size mtime) /etc/pam.d/xserver
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xserver
+%config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/XvMCConfig
+%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/xserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
%config(missingok) /etc/security/console.apps/xserver
%files Xvfb
%attr(755,root,root) %{_bindir}/xcursor-config
%attr(755,root,root) %{_bindir}/xft-config
%attr(755,root,root) %{_libdir}/libFS.so
-%attr(755,root,root) %{_libdir}/libI810XvMC.so
+%attr(755,root,root) %{_libdir}/lib*XvMC*.so
%attr(755,root,root) %{_libdir}/libICE.so
%attr(755,root,root) %{_libdir}/libSM.so
%attr(755,root,root) %{_libdir}/libX11.so
%attr(755,root,root) %{_libdir}/libXt.so
%attr(755,root,root) %{_libdir}/libXtst.so
%attr(755,root,root) %{_libdir}/libXv.so
-%attr(755,root,root) %{_libdir}/libXvMC.so
%attr(755,root,root) %{_libdir}/libXxf86dga.so
%attr(755,root,root) %{_libdir}/libXxf86misc.so
%attr(755,root,root) %{_libdir}/libXxf86rush.so
%{_includedir}/xf86*.h
%{_libx11dir}/config
%{_mandir}/man1/bdftopcf.1*
+%{_mandir}/man1/xft-config.1*
%{_mandir}/man3/[A-FH-Zl]*
%{_pkgconfigdir}/xcomposite.pc
%{_pkgconfigdir}/xcursor.pc
%{_includedir}/X11/Xserver
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-apm
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.so
%{_mandir}/man4/apm.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-ark
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.so
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} mips ppc arm sparc64
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-chips
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.so
%{_mandir}/man4/chips.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} alpha sparc64
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-cirrus
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
+%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.so
%{_mandir}/man4/cirrus.4*
%endif
%ifarch %{ix86} ia64 %{x8664}
%files driver-cyrix
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.so
%{_mandir}/man4/cyrix.4*
%endif
-%ifarch %{ix86} ia64 %{x8664} alpha sparc sparc64 mips ppc arm superh
+%ifarch %{ix86} ia64 %{x8664} alpha sparc sparc64 sparcv9 mips ppc arm superh
%files driver-fbdev
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.so
%{_mandir}/man4/fbdev.4*
%endif
%if %{with glide}
%files driver-glide
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.so
%{_mandir}/man4/glide.4*
%endif
%endif
%files driver-glint
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.so
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
+#%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
%{_mandir}/man4/glint.4*
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-i128
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.so
%{_mandir}/man4/i128.4*
%endif
+%files driver-i2c
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/multimedia/bt*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/fi*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/tda*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/msp*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/uda*.so
+
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 sparc64
+%ifarch %{ix86} ia64
%files driver-i740
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.so
%{_mandir}/man4/i740.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-i810
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
-%ifarch %{ix86} ia64 sparc64
+%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.so
+%ifarch %{ix86} ia64
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
%endif
%attr(755,root,root) %{_libdir}/modules/dri/i915_dri.so
%if 0
%files driver-imstt
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.so
%{_mandir}/man4/imstt.4*
%endif
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 mips alpha ppc arm
%files driver-mga
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.so
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
%endif
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} sparc64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-neomagic
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.so
%{_mandir}/man4/neomagic.4*
%endif
# Devel: %{ix86} sparc sparc64 %{x8664}
-%ifarch mips sparc64
+%ifarch mips
%files driver-newport
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.so
%{_mandir}/man4/newport.4*
%endif
%ifarch %{ix86}
%files driver-nsc
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/nsc_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/nsc_drv.so
%{_mandir}/man4/nsc.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} mips alpha arm ppc sparc64
+%ifarch %{ix86} ia64 %{x8664} mips alpha arm ppc
%files driver-nv
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
-%attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
+%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.so
+%attr(755,root,root) %{_libdir}/modules/drivers/riva128.so
%{_mandir}/man4/nv.4*
%endif
%files driver-ati
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/theatre*_drv.so
%files driver-r128
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.so
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
%files driver-radeon
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.so
%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
+%if %{with r300}
+%attr(755,root,root) %{_libdir}/modules/dri/r300_dri.so
+%endif
%endif
%{_mandir}/man4/radeon.4*
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} alpha sparc64
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-rendition
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.so
%{_libdir}/modules/*.uc
%{_mandir}/man4/rendition.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm sparc64
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-s3virge
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.so
%{_mandir}/man4/s3virge.4*
%endif
%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
+%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.so
#%%{_mandir}/man4/s3.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm sparc64
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-savage
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.so
%{_mandir}/man4/savage.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 %{x8664} alpha sparc64
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-siliconmotion
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.so
%{_mandir}/man4/siliconmotion.4*
%endif
%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
+%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.so
%ifarch %{ix86} ia64
%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
%{_mandir}/man4/sis.4*
%endif
-%ifarch sparc sparc64
+%files driver-sisusb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/sisusb_drv.so
+%{_mandir}/man4/sisusb.4*
+
+%ifarch sparc sparc64 sparcv9
%files driver-sunbw2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.so
%{_mandir}/man4/sunbw2.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suncg14
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.so
%{_mandir}/man4/suncg14.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suncg3
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.so
%{_mandir}/man4/suncg3.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suncg6
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.so
%{_mandir}/man4/suncg6.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-sunffb
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.so
# Devel: %{ix86} ia64 (for fun?)
%attr(755,root,root) %{_libdir}/modules/dri/ffb_dri.so
%{_mandir}/man4/sunffb.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-sunleo
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.so
%{_mandir}/man4/sunleo.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suntcx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.so
%{_mandir}/man4/suntcx.4*
%endif
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha arm ppc
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 mips alpha arm ppc
%files driver-tdfx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.so
%ifarch %{ix86} ia64 alpha arm
%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
%endif
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} sparc64 ia64 %{x8664} alpha
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-tga
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.so
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} sparc64 ia64 %{x8664} mips ppc arm
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-trident
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.so
%{_mandir}/man4/trident.4*
%endif
%ifarch %{ix86} ia64 %{x8664}
%files driver-tseng
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.so
%{_mandir}/man4/tseng.4*
%endif
%ifarch %{ix86} ia64
%files driver-via
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.so
+%ifarch %{ix86}
+%attr(755,root,root) %{_libdir}/modules/dri/unichrome_dri.so
+%endif
%{_mandir}/man4/via.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} sparc64 ia64
+%ifarch %{ix86} ia64
%files driver-vmware
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.so
%{_mandir}/man4/vmware.4*
%endif
%files libs
%defattr(644,root,root,755)
+/etc/ld.so.conf.d/*.conf
%dir %{_sysconfdir}/xdg
%dir %{_themesdir}
%dir %{_themesdir}/Default
%lang(es) %dir %{_appdefsdir}/es
%lang(fr) %dir %{_appdefsdir}/fr
%lang(hu) %dir %{_appdefsdir}/hu
+%lang(it) %dir %{_appdefsdir}/it
+%lang(ja) %dir %{_appdefsdir}/ja
%lang(ko) %dir %{_appdefsdir}/ko
%lang(nl) %dir %{_appdefsdir}/nl
%lang(pl) %dir %{_appdefsdir}/pl
%dir %{_xsessdir}
%dir %{_wmstylesdir}
%attr(755,root,root) %{_libdir}/libFS.so.*.*
-%attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*
+%attr(755,root,root) %{_libdir}/lib*XvMC*.so.*.*
%attr(755,root,root) %{_libdir}/libICE.so.*.*
%attr(755,root,root) %{_libdir}/libSM.so.*.*
%attr(755,root,root) %{_libdir}/libX11.so.*.*
%attr(755,root,root) %{_libdir}/libXt.so.*.*
%attr(755,root,root) %{_libdir}/libXtst.so.*.*
%attr(755,root,root) %{_libdir}/libXv.so.*.*
-%attr(755,root,root) %{_libdir}/libXvMC.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86dga.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86misc.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86rush.so.*.*
%dir %{_libdir}/modules
%dir %{_libdir}/modules/dri
%dir %{_libdir}/modules/drivers
-%attr(755,root,root) %{_libdir}/modules/*.a
-%attr(755,root,root) %{_libdir}/modules/drivers/linux
+%attr(755,root,root) %{_libdir}/modules/*.so
+%attr(755,root,root) %{_libdir}/modules/drivers/v4l_drv.so
%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
-%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.so
%endif
%ifarch %{ix86} ia64 %{x8664} sparc sparc64
-%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.so
%endif
%dir %{_libdir}/modules/extensions
-%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libdri.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libextmod.a
-%attr(755,root,root) %{_libdir}/modules/extensions/librecord.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.a
+%dir %{_libdir}/modules/multimedia
+%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libdri.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libextmod.so
+%attr(755,root,root) %{_libdir}/modules/extensions/librecord.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.so
%attr(755,root,root) %{_libdir}/modules/fonts
%attr(755,root,root) %{_libdir}/modules/input
%attr(755,root,root) %{_libdir}/modules/linux
%{_mandir}/man4/tek4957.4*
%{_mandir}/man4/ur98.4*
%{_mandir}/man4/v4l.4*
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 alpha ppc arm
%{_mandir}/man4/vga.4*
%endif
-%ifarch %{ix86} ia64 %{x8664} sparc sparc64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9
%{_mandir}/man4/vesa.4*
%endif
%{_mandir}/man4/void.4*
%files static
%defattr(644,root,root,755)
%{_libdir}/libFS.a
-%{_libdir}/libI810XvMC.a
+%{_libdir}/lib*XvMC*.a
%{_libdir}/libICE.a
%{_libdir}/libSM.a
%{_libdir}/libX11.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
%{_libdir}/libXv.a
-%{_libdir}/libXvMC.a
%{_libdir}/libXxf86dga.a
%{_libdir}/libXxf86misc.a
%{_libdir}/libXxf86rush.a
%attr(755,root,root) %{_bindir}/xclipboard
%attr(755,root,root) %{_bindir}/xclock
%attr(755,root,root) %{_bindir}/xditview
+%attr(755,root,root) %{_bindir}/xdbedizzy
+%attr(755,root,root) %{_bindir}/xdpr
%attr(755,root,root) %{_bindir}/xdriinfo
%attr(755,root,root) %{_bindir}/xedit
%attr(755,root,root) %{_bindir}/xev
%attr(755,root,root) %{_bindir}/xmore
%attr(755,root,root) %{_bindir}/xphelloworld
%attr(755,root,root) %{_bindir}/xplsprinters
+%attr(755,root,root) %{_bindir}/xpr
%attr(755,root,root) %{_bindir}/xprehashprinterlist
%attr(755,root,root) %{_bindir}/xpsimplehelloworld
%attr(755,root,root) %{_bindir}/xpxthelloworld
%{_mandir}/man1/xclipboard.1*
%{_mandir}/man1/xclock.1*
%{_mandir}/man1/xditview.1*
+%{_mandir}/man1/xdbedizzy.1*
+%{_mandir}/man1/xdpr.1*
%{_mandir}/man1/xdriinfo.1*
%{_mandir}/man1/xmore.1*
%{_mandir}/man1/xedit.1*
%{_mandir}/man1/xmh.1*
%{_mandir}/man1/xphelloworld.1*
%{_mandir}/man1/xplsprinters.1*
+%{_mandir}/man1/xpr.1*
%{_mandir}/man1/xprehashprinterlist.1*
%{_mandir}/man1/xpsimplehelloworld.1*
%{_mandir}/man1/xpxthelloworld.1*
%files xauth
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/xauth
+%attr(755,root,root) %{_bindir}/xauth*
%{_mandir}/man1/xauth.1*
%files xdm
%defattr(644,root,root,755)
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/xdm
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xdm
%attr(754,root,root) /etc/rc.d/init.d/xdm
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xdm
/var/lib/xdm
%{_appdefsdir}/Chooser
%{_mandir}/man1/xdm.1*
%dir %{_sysconfdir}/X11/xdm
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/GiveConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/TakeConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xsession
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xsetup_0
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xwilling
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xaccess
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xresources
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xservers
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/xdm-config
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/GiveConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/TakeConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsession
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsetup_0
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xwilling
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xaccess
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xresources
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xservers
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/xdm-config
%{_sysconfdir}/X11/xdm/pixmaps
%{_sysconfdir}/X11/xdm/authdir
%files xfs
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/xfs
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xfs
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xfs
%dir %{_sysconfdir}/X11/fs
%attr(755,root,root) %{_libx11dir}/fs
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/fs/config
%attr(755,root,root) %{_bindir}/xfs
%attr(755,root,root) %{_bindir}/fslsfonts
projects / packages / X11.git / blobdiff