+#
+# Conditional build:
+%bcond_with xprint # Xprint server (broken, upstream doesn't intend to fix it)
+%bcond_with multigl # package libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
+%bcond_with dri2 # DRI2 support
+%bcond_with hal # HAL support
+%bcond_with record # RECORD extension
+%bcond_with xtrap # XTrap extension (deprecated)
+#
+# ABI versions, see hw/xfree86/common/xf86Module.h
+%define xorg_xserver_server_ansic_abi 0.4
+%define xorg_xserver_server_extension_abi 1.1
+%define xorg_xserver_server_font_abi 0.6
+%define xorg_xserver_server_videodrv_abi 4.1
+%define xorg_xserver_server_xinput_abi 2.1
+
Summary: X.org server
-Summary(pl): Serwer X.org
+Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 1.0.99.903
-Release: 0.1
+Version: 1.5.1
+Release: 1%{?with_multigl:.mgl}
License: MIT
Group: X11/Servers
Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 18a1b0077839bfd5052a666c0de63f6d
-%define mesa_version 6.5
-Source1: http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2
-# Source1-md5: 61beda590bfc5b4a12e979d5f2d70d7a
+# Source0-md5: d16f5a033f001c9069b4141194614da2
Source2: xserver.pamd
Patch0: %{name}-ncurses.patch
-Patch1: %{name}-symlinks.patch
-Patch2: %{name}-xwrapper.patch
-Patch3: %{name}-compositefastpath.patch
+Patch1: %{name}-xwrapper.patch
+Patch2: %{name}-glyph.patch
URL: http://xorg.freedesktop.org/
+BuildRequires: Mesa-libGL-devel >= 7.1
# for glx headers
BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.57
BuildRequires: automake
BuildRequires: cpp
-BuildRequires: libdrm-devel
+%if %{with hal}
+BuildRequires: dbus-devel
+BuildRequires: hal-devel
+%endif
+BuildRequires: libdrm-devel >= 2.3.1
BuildRequires: libtool
BuildRequires: ncurses-devel
BuildRequires: pam-devel
BuildRequires: perl-base
+BuildRequires: pixman-devel >= 0.9.5
BuildRequires: pkgconfig >= 1:0.19
BuildRequires: xorg-app-mkfontscale
BuildRequires: xorg-lib-libX11-devel
BuildRequires: xorg-lib-libXext-devel
BuildRequires: xorg-lib-libXfont-devel
BuildRequires: xorg-lib-libXi-devel
+BuildRequires: xorg-lib-libXmu-devel
+BuildRequires: xorg-lib-libXpm-devel
BuildRequires: xorg-lib-libXrender-devel
BuildRequires: xorg-lib-libXres-devel
BuildRequires: xorg-lib-libXt-devel >= 1.0.0
BuildRequires: xorg-lib-libXxf86vm-devel
BuildRequires: xorg-lib-libdmx-devel
BuildRequires: xorg-lib-libfontenc-devel
-BuildRequires: xorg-lib-liblbxutil-devel
+BuildRequires: xorg-lib-libpciaccess-devel
BuildRequires: xorg-lib-libxkbfile-devel
-BuildRequires: xorg-lib-libxkbui-devel
+BuildRequires: xorg-lib-libxkbui-devel >= 1.0.2
BuildRequires: xorg-lib-xtrans-devel
BuildRequires: xorg-proto-bigreqsproto-devel
-BuildRequires: xorg-proto-compositeproto-devel >= 0.3
-BuildRequires: xorg-proto-damageproto-devel
+BuildRequires: xorg-proto-compositeproto-devel >= 0.4
+BuildRequires: xorg-proto-damageproto-devel >= 1.1
BuildRequires: xorg-proto-dmxproto-devel
BuildRequires: xorg-proto-evieext-devel
BuildRequires: xorg-proto-fixesproto-devel >= 4.0
BuildRequires: xorg-proto-fontcacheproto-devel
BuildRequires: xorg-proto-fontsproto-devel
-BuildRequires: xorg-proto-glproto-devel >= 1.4.6
+BuildRequires: xorg-proto-glproto-devel >= 1.4.8
+BuildRequires: xorg-proto-inputproto-devel >= 1.4.2
+BuildRequires: xorg-proto-kbproto-devel >= 1.0.3
BuildRequires: xorg-proto-printproto-devel
-BuildRequires: xorg-proto-randrproto-devel
-BuildRequires: xorg-proto-recordproto-devel
-BuildRequires: xorg-proto-renderproto-devel
+BuildRequires: xorg-proto-randrproto-devel >= 1.2
+%{?with_record:BuildRequires: xorg-proto-recordproto-devel}
+BuildRequires: xorg-proto-renderproto-devel >= 0.9.3
BuildRequires: xorg-proto-resourceproto-devel
BuildRequires: xorg-proto-scrnsaverproto-devel >= 1.1.0
-BuildRequires: xorg-proto-trapproto-devel
+%{?with_xtrap:BuildRequires: xorg-proto-trapproto-devel}
BuildRequires: xorg-proto-videoproto-devel
BuildRequires: xorg-proto-xcmiscproto-devel
BuildRequires: xorg-proto-xextproto-devel
BuildRequires: xorg-proto-xf86bigfontproto-devel
BuildRequires: xorg-proto-xf86dgaproto-devel
-BuildRequires: xorg-proto-xf86driproto-devel
+BuildRequires: xorg-proto-xf86driproto-devel >= 2.0.4
BuildRequires: xorg-proto-xf86miscproto-devel
BuildRequires: xorg-proto-xf86vidmodeproto-devel
BuildRequires: xorg-proto-xineramaproto-devel
-BuildRequires: xorg-proto-xproto-devel
+BuildRequires: xorg-proto-xproto-devel >= 7.0.9
BuildRequires: xorg-util-util-macros >= 0.99.2
+#BR: xcalibrateproto, tslib (for KDRIVE only)
+#BR: glitz-devel >= 0.4.3 (for XGL and EGL only)
+Requires(triggerpostun): sed >= 4.0
+Requires: pixman >= 0.9.5
+Requires: xkeyboard-config
# for rgb.txt
Requires: xorg-app-rgb >= 0.99.3
Requires: xorg-app-xkbcomp
-# just for %{_includedir}/bitmaps dir
-Requires: xorg-data-xbitmaps
-Requires: xorg-data-xkbdata
-# xserver requires default fixed and cursosr fonts.
+# xserver requires fixed and cursor fonts
Requires: xorg-font-font-alias
Requires: xorg-font-font-cursor-misc
Requires: xorg-font-font-misc-misc-base >= 1.0.0-0.3
-# for new app-defaults location
-Requires: xorg-lib-libXt >= 1.0.0
-Obsoletes: X11-Xserver
-Obsoletes: X11-modules
-Obsoletes: XFree86-Xserver
-Obsoletes: XFree86-modules
+Provides: xorg-xserver-server(ansic-abi) = %{xorg_xserver_server_ansic_abi}
+Provides: xorg-xserver-server(extension-abi) = %{xorg_xserver_server_extension_abi}
+Provides: xorg-xserver-server(font-abi) = %{xorg_xserver_server_font_abi}
+Provides: xorg-xserver-server(videodrv-abi) = %{xorg_xserver_server_videodrv_abi}
+Provides: xorg-xserver-server(xinput-abi) = %{xorg_xserver_server_xinput_abi}
+Obsoletes: X11-Xserver < 1:7.0.0
+Obsoletes: X11-driver-i2c < 1:7.0.0
+Obsoletes: X11-modules < 1:7.0.0
+Obsoletes: X11-setup < 1:7.0.0
+Obsoletes: XFree86-Xserver < 1:7.0.0
+Obsoletes: XFree86-modules < 1:7.0.0
+Obsoletes: XFree86-setup < 1:7.0.0
+Obsoletes: Xserver
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+# avoid self-dependencies on included modules
+%define _noautoreq libscanpci.so libxf1bpp.so
+
%description
Xorg server is a generally used X server which uses display hardware.
It requires proper driver for your display hardware.
-%description -l pl
-Serwer Xorg to podstawowy serwer X wy¶wietlaj±cy obraz na karcie
-graficznej. Do dzia³ania wymaga odpowiedniego sterownika.
+%description -l pl.UTF-8
+Serwer Xorg to podstawowy serwer X wyświetlający obraz na karcie
+graficznej. Do działania wymaga odpowiedniego sterownika.
%package -n xorg-xserver-Xdmx
Summary: Xdmx - distributed multi-head X server
-Summary(pl): Xdmx - rozproszony, wielomonitorowy serwer X
+Summary(pl.UTF-8): Xdmx - rozproszony, wielomonitorowy serwer X
Group: X11/Servers
%description -n xorg-xserver-Xdmx
Xdmx - distributed multi-head X server.
-%description -n xorg-xserver-Xdmx -l pl
+%description -n xorg-xserver-Xdmx -l pl.UTF-8
Xdmx - rozproszony, wielomonitorowy serwer X.
%package -n xorg-xserver-Xnest
Summary: Xnest - nested X server
-Summary(pl): Xnest - zagnie¿d¿ony serwer X
+Summary(pl.UTF-8): Xnest - zagnieżdżony serwer X
Group: X11/Servers
-Obsoletes: X11-Xnest
-Obsoletes: XFree86-Xnest
+Obsoletes: X11-Xnest < 1:7.0.0
+Obsoletes: XFree86-Xnest < 1:7.0.0
+Obsoletes: Xserver-Xnest
%description -n xorg-xserver-Xnest
Xnest is an X Window System server which runs in an X window. Xnest is
which manages windows and graphics requests for Xnest, while Xnest
manages the windows and graphics requests for its own clients.
-%description -n xorg-xserver-Xnest -l pl
+%description -n xorg-xserver-Xnest -l pl.UTF-8
Xnest jest serwerem X uruchamianym w okienku innego serwera X. Xnest
-zachowuje siê jak klient X w stosunku do prawdziwego serwera X, a jak
-serwer X dla w³asnych klientów.
+zachowuje się jak klient X w stosunku do prawdziwego serwera X, a jak
+serwer X dla własnych klientów.
-%description -n xorg-xserver-Xnest -l ru
-Xnest - ÜÔÏ ÓÅÒ×ÅÒ X Window System, ËÏÔÏÒÙÊ ÒÁÂÏÔÁÅÔ × ÏËÎÅ X. îÁ
-ÓÁÍÏÍ ÄÅÌÅ ÜÔÏ ËÌÉÅÎÔ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ, ËÏÔÏÒÙÊ ÕÐÒÁ×ÌÑÅÔ ÏËÎÁÍÉ É
-ÇÒÁÆÉÞÅÓËÉÍÉ ÚÁÐÒÏÓÁÍÉ ÄÌÑ Xnest × ÔÏ ×ÒÅÍÑ, ËÁË Xnest ÕÐÒÁ×ÌÑÅÔ
-ÏËÎÁÍÉ É ÇÒÁÆÉÞÅÓËÉÍÉ ÚÁÐÒÏÓÁÍÉ ÄÌÑ Ó×ÏÉÈ ÓÏÂÓÔ×ÅÎÎÙÈ ËÌÉÅÎÔÏ×.
+%description -n xorg-xserver-Xnest -l ru.UTF-8
+Xnest - это сервер X Window System, который работает в окне X. На
+самом деле это клиент реального X-сервера, который управляет окнами и
+графическими запросами для Xnest в то время, как Xnest управляет
+окнами и графическими запросами для своих собственных клиентов.
-%description -n xorg-xserver-Xnest -l uk
-Xnest - ÃÅ ÓÅÒ×ÅÒ X Window System, ÑËÉÊ ÐÒÁÃÀ¤ Õ ×¦ËΦ X. æÁËÔÉÞÎÏ ÃÅ
-Ë̦¤ÎÔ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ, ÑËÉÊ ËÅÒÕ¤ צËÎÁÍÉ ÔÁ ÇÒÁƦÞÎÉÍÉ ÚÁÐÉÔÁÍÉ
-ÄÌÑ Xnest × ÔÏÊ ÞÁÓ, ÑË Xnest ËÅÒÕ¤ צËÎÁÍÉ ÔÁ ÇÒÁƦÞÎÉÍÉ ÚÁÐÉÔÁÍÉ ÄÌÑ
-Ó×Ï§È ×ÌÁÓÎÉÈ Ë̦¤ÎÔ¦×.
+%description -n xorg-xserver-Xnest -l uk.UTF-8
+Xnest - це сервер X Window System, який працює у вікні X. Фактично це
+клієнт реального X-сервера, який керує вікнами та графічними запитами
+для Xnest в той час, як Xnest керує вікнами та графічними запитами для
+своїх власних клієнтів.
%package -n xorg-xserver-Xprt
Summary: Xprt - Xprint server for X
-Summary(pl): Xprt - serwer Xprint dla X
+Summary(pl.UTF-8): Xprt - serwer Xprint dla X
Group: X11/Servers
-Obsoletes: X11-Xprt
-Obsoletes: XFree86-Xprt
+Obsoletes: X11-Xprt < 1:7.0.0
+Obsoletes: XFree86-Xprt < 1:7.0.0
%description -n xorg-xserver-Xprt
Xprt is the Xprint print server for X Window System for non display
devices such as printers and fax machines.
-%description -n xorg-xserver-Xprt -l pl
-Xprt to serwer wydruków Xprint dla X Window System dla urz±dzeñ nie
-wy¶wietlaj±cych, takich jak drukarki czy faksy.
+%description -n xorg-xserver-Xprt -l pl.UTF-8
+Xprt to serwer wydruków Xprint dla X Window System dla urządzeń nie
+wyświetlających, takich jak drukarki czy faksy.
%package -n xorg-xserver-Xvfb
Summary: Xvfb - virtual framebuffer X server
-Summary(pl): Xvfb - serwer X z wirtualnym framebufferem
+Summary(pl.UTF-8): Xvfb - serwer X z wirtualnym framebufferem
Group: X11/Servers
-Obsoletes: X11-Xvfb
-Obsoletes: XFree86-Xvfb
+# requires fixed and cursor fonts
+Requires: xorg-font-font-alias
+Requires: xorg-font-font-cursor-misc
+Requires: xorg-font-font-misc-misc-base >= 1.0.0-0.3
+Obsoletes: X11-Xvfb < 1:7.0.0
+Obsoletes: XFree86-Xvfb < 1:7.0.0
%description -n xorg-xserver-Xvfb
Xvfb (X Virtual Frame Buffer) is an X Window System server that is
to provide an unobtrusive way of running applications which really
don't need an X server but insist on having one.
-%description -n xorg-xserver-Xvfb -l pl
-Xvfb (X Virtual Frame Buffer) jest serwerem X, który mo¿na uruchamiaæ
-na maszynach bez urz±dzeñ wy¶wietlaj±cych ani fizycznych urz±dzeñ
-wej¶ciowych. Xvfb emuluje prosty framebuffer w pamiêci. Zwykle jest
-u¿ywany do testowania serwerów X, mo¿e te¿ byæ u¿ywany do testowania
-klientów X w rzadko u¿ywanych konfiguracjach ekranu. Mo¿na te¿ u¿yæ
-Xvfb do uruchomienia aplikacji, które w rzeczywisto¶ci nie wymagaj±
-serwera X, ale odmawiaj± uruchomienia bez niego.
+%description -n xorg-xserver-Xvfb -l pl.UTF-8
+Xvfb (X Virtual Frame Buffer) jest serwerem X, który można uruchamiać
+na maszynach bez urządzeń wyświetlających ani fizycznych urządzeń
+wejściowych. Xvfb emuluje prosty framebuffer w pamięci. Zwykle jest
+używany do testowania serwerów X, może też być używany do testowania
+klientów X w rzadko używanych konfiguracjach ekranu. Można też użyć
+Xvfb do uruchomienia aplikacji, które w rzeczywistości nie wymagają
+serwera X, ale odmawiają uruchomienia bez niego.
%package devel
Summary: Header files for X.org server
-Summary(pl): Pliki nag³ówkowe dla servera X.org
+Summary(pl.UTF-8): Pliki nagłówkowe dla servera X.org
Group: X11/Development/Libraries
-Requires: libdrm-devel
+Requires: libdrm-devel >= 2.3.0
+Requires: pixman-devel >= 0.9.5
Requires: xorg-proto-fontsproto-devel
-Requires: xorg-proto-renderproto-devel
+Requires: xorg-proto-renderproto-devel >= 0.9.3
Requires: xorg-proto-videoproto-devel
Requires: xorg-proto-xextproto-devel
-Obsoletes: X11-Xserver-devel
-Obsoletes: X11-XFree86-devel
+Requires: xorg-proto-xproto-devel >= 7.0.9
+Obsoletes: X11-Xserver-devel < 1:7.0.0
+Obsoletes: XFree86-Xserver-devel < 1:7.0.0
%description devel
Header files for X.org server.
-%description devel -l pl
-Pliki nag³ówkowe dla serwera X.org.
+%description devel -l pl.UTF-8
+Pliki nagłówkowe dla serwera X.org.
+
+%package xorgcfg
+Summary: xorgcfg - graphical configuration tool for X.org server
+Summary(pl.UTF-8): xorgcfg - graficzne narzędzie konfiguracyjne dla serwera X.org
+Group: X11/Servers
+Requires: %{name} = %{version}-%{release}
+# just for %{_includedir}/bitmaps dir?
+Requires: xorg-data-xbitmaps
+# for new app-defaults location
+Requires: xorg-lib-libXt >= 1.0.0
+Requires: xorg-lib-libxkbui >= 1.0.2
+
+%description xorgcfg
+xorgcfg is a tool to configure X.org server, and can be used to either
+write the initial configuration file or make customizations to the
+current configuration.
+
+%description xorgcfg -l pl.UTF-8
+xorgcfg to narzędzie do konfiguracji serwera X.org. Można go użyć do
+utworzenia początkowego pliku konfiguracyjnego lub dokonania
+modyfikacji istniejącej konfiguracji.
%package -n xorg-xserver-libglx
Summary: GLX extension library fo X.org server
-Summary(pl): Biblioteka rozszerzenia GLX dla serwera X.org
+Summary(pl.UTF-8): Biblioteka rozszerzenia GLX dla serwera X.org
Group: X11/Servers
-Requires: xorg-xserver-server
+Requires: %{name} = %{version}-%{release}
+# Mesa version glapi tables in glx/ dir come from
+Provides: xorg-xserver-libglx(glapi) = 7.1.0
Provides: xorg-xserver-modules-libglx
-Obsoletes: xorg-driver-video-nvidia
+Obsoletes: X11-OpenGL-core < 1:7.0.0
+Obsoletes: XFree86-OpenGL-core < 1:7.0.0
+%if %{without multigl}
+Conflicts: xorg-driver-video-nvidia
+%endif
%description -n xorg-xserver-libglx
GLX extension library fo X.org server.
-%description -n xorg-xserver-libglx -l pl
+%description -n xorg-xserver-libglx -l pl.UTF-8
Biblioteka rozszerzenia GLX dla serwera X.org.
%prep
-%setup -q -a1 -n xorg-server-%{version}
+%setup -q -n xorg-server-%{version}
%patch0 -p1
-%patch1 -p1
-%patch2 -p0
-%patch3 -p0
+%patch1 -p0
+%patch2 -p1
+
+# xserver uses pixman-1 API/ABI so put that explictly here
+sed -i -e 's#<pixman\.h#<pixman-1/pixman.h#g' ./fb/fb.h ./include/miscstruct.h ./render/picture.h
%build
+API=$(awk '/#define ABI_ANSIC_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_ansic_abi} ]; then
+ echo "Set %%define xorg_xserver_server_ansic_abi to $API and rerun."
+ exit 1
+fi
+
+API=$(awk '/#define ABI_EXTENSION_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_extension_abi} ]; then
+ echo "Set %%define xorg_xserver_server_extension_abi to $API and rerun."
+ exit 1
+fi
+
+API=$(awk '/#define ABI_FONT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_font_abi} ]; then
+ echo "Set %%define xorg_xserver_server_font_abi to $API and rerun."
+ exit 1
+fi
+API=$(awk '/#define ABI_VIDEODRV_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_videodrv_abi} ]; then
+ echo "Set %%define xorg_xserver_server_videodrv_abi to $API and rerun."
+ exit 1
+fi
+API=$(awk '/#define ABI_XINPUT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h)
+if [ $API != %{xorg_xserver_server_xinput_abi} ]; then
+ echo "Set %%define xorg_xserver_server_xinput_abi to $API and rerun."
+ exit 1
+fi
+
%{__libtoolize}
%{__aclocal}
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- --enable-dga \
+ --with-os-name="PLD/Linux" \
+ --with-os-vendor="PLD/Team" \
+ --disable-builtin-fonts \
+ %{!?with_hal:--disable-config-hal} \
+ --enable-aiglx \
--enable-builddocs \
- --enable-lbx \
+ --enable-dga \
+ --enable-dmx \
+ --enable-glx-tls \
+ --enable-install-libxf86config \
+ %{?with_record:--enable-record} \
+ --enable-secure-rpc \
--enable-xevie \
+ --enable-xorgcfg \
+ %{?with_xtrap:--enable-xtrap} \
+ --%{?with_dri2:en}%{!?with_dri2:dis}able-dri2 \
+ --%{?with_xprint:en}%{!?with_xprint:dis}able-xprint \
--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
- --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
- --with-mesa-source="`pwd`/Mesa-%{mesa_version}"
+ --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
+ --with-xkb-output=/var/lib/xkb
%{__make}
install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
install -d $RPM_BUILD_ROOT/etc/security/console.apps
-install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
+install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
:> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
:> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
+%if %{with multigl}
+cd $RPM_BUILD_ROOT%{_libdir}/xorg/modules/extensions
+mv -f libglx.so libglx.so.%{version}
+ln -sf libglx.so.%{version} libglx.so
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
+%if %{with multigl}
+%post -n xorg-xserver-libglx
+if [ ! -e %{_libdir}/xorg/modules/extensions/libglx.so ]; then
+ ln -sf libglx.so.%{version} %{_libdir}/xorg/modules/extensions/libglx.so
+fi
+%endif
+
+%triggerpostun -- xorg-xserver-server < 1.5.0
+if [ -f /etc/X11/xorg.conf ]; then
+ sed -i -e 's/^\s*RgbPath.*$/#& # obsolete option/' /etc/X11/xorg.conf
+ sed -i -e 's/^\s*Load\s*"type1".*$/#& # obsolete module/' /etc/X11/xorg.conf
+%if %{without record}
+ sed -i -e 's/^\s*Load\s*"record".*$/#& # module disabled in this build/' /etc/X11/xorg.conf
+%endif
+%if %{without xtrap}
+ sed -i -e 's/^\s*Load\s*"xtrap".*$/#& # deprecated module, disabled/' /etc/X11/xorg.conf
+%endif
+fi
+
%files
%defattr(644,root,root,755)
%doc COPYING ChangeLog
%attr(755,root,root) %{_bindir}/Xorg
%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/cvt
-%attr(755,root,root) %{_bindir}/getconfig
-%attr(755,root,root) %{_bindir}/getconfig.pl
%attr(755,root,root) %{_bindir}/gtf
%attr(755,root,root) %{_bindir}/in[bwl]
%attr(755,root,root) %{_bindir}/ioport
%attr(755,root,root) %{_bindir}/out[bwl]
-%attr(755,root,root) %{_bindir}/pcitweak
-%attr(755,root,root) %{_bindir}/scanpci
-%attr(755,root,root) %{_bindir}/xorgcfg
%attr(755,root,root) %{_bindir}/xorgconfig
-%{_includedir}/X11/bitmaps/*
-%{_includedir}/X11/pixmaps
%{_libdir}/X11/Cards
%{_libdir}/X11/Options
-%{_libdir}/X11/getconfig
%dir %{_libdir}/xorg
+%{_libdir}/xorg/protocol.txt
%dir %{_libdir}/xorg/modules
+%dir %{_libdir}/xorg/modules/dri
%dir %{_libdir}/xorg/modules/drivers
%dir %{_libdir}/xorg/modules/extensions
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libGLcore.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
+%{?with_dri2:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri2.so}
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libxtrap.so
+%{?with_record:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so}
+%{?with_xtrap:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libxtrap.so}
%dir %{_libdir}/xorg/modules/fonts
%attr(755,root,root) %{_libdir}/xorg/modules/fonts/lib*.so
%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/xorg/modules/linux
-%attr(755,root,root) %{_libdir}/xorg/modules/linux/libdrm.so
%attr(755,root,root) %{_libdir}/xorg/modules/linux/libfbdevhw.so
%dir %{_libdir}/xorg/modules/multimedia
%attr(755,root,root) %{_libdir}/xorg/modules/multimedia/*.so
%attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
-%dir %{_libdir}/xserver
-%{_libdir}/xserver/SecurityPolicy
-%{_datadir}/X11/app-defaults/XOrgCfg
-%{_datadir}/X11/xkb/compiled
+%dir /var/lib/xkb
+/var/lib/xkb/README.compiled
%attr(640,root,root) %config(noreplace) %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
%{_mandir}/man1/Xorg.1x*
%{_mandir}/man1/Xserver.1x*
%{_mandir}/man1/cvt.1*
-%{_mandir}/man1/getconfig.1x*
%{_mandir}/man1/gtf.1x*
-%{_mandir}/man1/pcitweak.1x*
-%{_mandir}/man1/scanpci.1x*
-%{_mandir}/man1/xorgcfg.1x*
%{_mandir}/man1/xorgconfig.1*
+%{_mandir}/man4/exa.4*
%{_mandir}/man4/fbdevhw.4*
-%{_mandir}/man5/getconfig.5x*
%{_mandir}/man5/xorg.conf.5x*
%files -n xorg-xserver-Xdmx
%attr(755,root,root) %{_bindir}/Xnest
%{_mandir}/man1/Xnest.1x*
+%if %{with xprint}
%files -n xorg-xserver-Xprt
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Xprt
%{_libdir}/X11/xserver
%{_mandir}/man1/Xprt.1x*
+%endif
%files -n xorg-xserver-Xvfb
%defattr(644,root,root,755)
%files devel
%defattr(644,root,root,755)
%{_includedir}/xorg
+%{_libdir}/libxf86config.a
%{_aclocaldir}/xorg-server.m4
%{_pkgconfigdir}/xorg-server.pc
+%files xorgcfg
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xorgcfg
+%{_includedir}/X11/bitmaps/*
+%{_includedir}/X11/pixmaps
+%{_datadir}/X11/app-defaults/XOrgCfg
+%{_mandir}/man1/xorgcfg.1x*
+
%files -n xorg-xserver-libglx
%defattr(644,root,root,755)
+%if %{with multigl}
+%ghost %{_libdir}/xorg/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so.%{version}
+%else
%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so
+%endif
projects / packages / xorg-xserver-server.git / blobdiff