X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=xorg-xserver-server.spec;h=3443272233842f16e211d5e9b2b04daf1337d458;hb=de45add197231c850a4149acccf6579578caff96;hp=ca09bedaa4181fc275632495add08d1d57c6fe93;hpb=156d8c26579867e96ebb2584939cb2471aa33bf6;p=packages%2Fxorg-xserver-server.git

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index ca09bed..3443272 100644
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -1,56 +1,70 @@
+# TODO: consider XSELINUX
 #
 # Conditional build:
-%bcond_with	multigl	# package libglx.so in a way allowing concurrent install with nvidia/fglrx drivers
-%bcond_without	dri2	# DRI2 support
-%bcond_with	dbus	# D-BUS support
-%bcond_with	hal	# HAL support
-%bcond_without	udev	# UDEV support
-%bcond_without	dmx	# DMX support
-%bcond_without	record	# RECORD extension
+%bcond_with	dbus		# D-BUS support for configuration (if no udev)
+%bcond_with	hal		# HAL support for configuration (if no udev)
+%bcond_without	udev		# UDEV support for configuration
+%bcond_without	dri2		# DRI2 extension
+%bcond_without	dmx		# DMX support
+%bcond_without	record		# RECORD extension
+%bcond_with	xcsecurity	# XC-SECURITY extension (deprecated)
+%bcond_with	xf86bigfont	# XF86BigFont extension
+%bcond_with	xselinux	# SELinux extension
 #
 # ABI versions, see hw/xfree86/common/xf86Module.h
 %define	xorg_xserver_server_ansic_abi		0.4
-%define	xorg_xserver_server_extension_abi	4.0
+%define	xorg_xserver_server_extension_abi	7.0
 %define	xorg_xserver_server_font_abi		0.6
-%define	xorg_xserver_server_videodrv_abi	8.0
-%define	xorg_xserver_server_xinput_abi		11.0
+%define	xorg_xserver_server_videodrv_abi	13.1
+%define	xorg_xserver_server_xinput_abi		18.0
+#
+%define	pixman_ver	0.28.0
 
-%define		rel	1
 Summary:	X.org server
 Summary(pl.UTF-8):	Serwer X.org
 Name:		xorg-xserver-server
-Version:	1.8.99.901
-Release:	%{rel}%{?with_multigl:.mgl}
+Version:	1.13.0.901
+Release:	0.1
 License:	MIT
 Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5:	ebc580fcf4ad9fb03ab9119525467f4a
-Source1:	10-quirks.conf                
+# Source0-md5:	8da850ca5d6f6aab8c620abb0ad21675
+Source1:	10-quirks.conf
 Source2:	xserver.pamd
+Source10:	%{name}-Xvfb.init
+Source11:	%{name}-Xvfb.sysconfig
 Patch0:		%{name}-xwrapper.patch
 Patch1:		%{name}-pic-libxf86config.patch
-Patch2:		%{name}-fb-size.patch
+
 Patch3:		%{name}-less-acpi-brokenness.patch
 Patch4:		%{name}-builtin-SHA1.patch
+Patch5:		%{name}-export-GetMaster.patch
+Patch6:		110_nvidia_slowdow_fix.patch
+Patch7:		%{name}-include-defs.patch
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	Mesa-libGL-devel >= 7.8.1
 # for glx headers
 BuildRequires:	OpenGL-GLX-devel
+%{?with_xselinux:BuildRequires:	audit-libs-devel}
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake
 BuildRequires:	cpp
+BuildRequires:	docbook-dtd43-xml
+#BuildRequires:	doxygen >= 1.6.1
 %if %{with hal} || %{with dbus}
-BuildRequires:	dbus-devel
+BuildRequires:	dbus-devel >= 1.0
 %endif
 %{?with_hal:BuildRequires:	hal-devel}
-BuildRequires:	libdrm-devel >= 2.4.5
+BuildRequires:	libdrm-devel >= 2.4.39
+%{?with_xselinux:BuildRequires:	libselinux-devel >= 2.0.86}
 BuildRequires:	libtool
 BuildRequires:	ncurses-devel
 BuildRequires:	pam-devel
 BuildRequires:	perl-base
-BuildRequires:	pixman-devel >= 0.16.0
+BuildRequires:	pixman-devel >= %{pixman_ver}
 BuildRequires:	pkgconfig >= 1:0.19
-BuildRequires:	udev-devel
+BuildRequires:	udev-devel >= 1:143
+BuildRequires:	xmlto >= 0.0.20
 BuildRequires:	xorg-app-mkfontscale
 BuildRequires:	xorg-font-font-util >= 1.1
 BuildRequires:	xorg-lib-libX11-devel
@@ -58,9 +72,9 @@ BuildRequires:	xorg-lib-libXau-devel
 BuildRequires:	xorg-lib-libXaw-devel
 BuildRequires:	xorg-lib-libXdamage-devel
 BuildRequires:	xorg-lib-libXdmcp-devel
-BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXfont-devel
-BuildRequires:	xorg-lib-libXi-devel >= 1.2
+BuildRequires:	xorg-lib-libXext-devel >= 1.0.99.4
+BuildRequires:	xorg-lib-libXfont-devel >= 1.4.2
+BuildRequires:	xorg-lib-libXi-devel >= 1.2.99.1
 BuildRequires:	xorg-lib-libXmu-devel
 BuildRequires:	xorg-lib-libXpm-devel
 BuildRequires:	xorg-lib-libXrender-devel
@@ -73,61 +87,65 @@ BuildRequires:	xorg-lib-libXxf86misc-devel
 BuildRequires:	xorg-lib-libXxf86vm-devel
 %{?with_dmx:BuildRequires:	xorg-lib-libdmx-devel >= 1.0.99.1}
 BuildRequires:	xorg-lib-libfontenc-devel
-BuildRequires:	xorg-lib-libpciaccess-devel
+BuildRequires:	xorg-lib-libpciaccess-devel >= 0.12.901
 BuildRequires:	xorg-lib-libxkbfile-devel
 BuildRequires:	xorg-lib-libxkbui-devel >= 1.0.2
 BuildRequires:	xorg-lib-xtrans-devel >= 1.2.2
 BuildRequires:	xorg-proto-bigreqsproto-devel >= 1.1.0
 BuildRequires:	xorg-proto-compositeproto-devel >= 0.4
 BuildRequires:	xorg-proto-damageproto-devel >= 1.1
-%{?with_dmx:BuildRequires:	xorg-proto-dmxproto-devel}
-%{?with_dri2:BuildRequires:	xorg-proto-dri2proto-devel >= 2.1}
-BuildRequires:	xorg-proto-fixesproto-devel >= 4.1
+%{?with_dmx:BuildRequires:	xorg-proto-dmxproto-devel >= 2.2.99.1}
+%{?with_dri2:BuildRequires:	xorg-proto-dri2proto-devel >= 2.8}
+BuildRequires:	xorg-proto-fixesproto-devel >= 5.0
 BuildRequires:	xorg-proto-fontcacheproto-devel
 BuildRequires:	xorg-proto-fontsproto-devel
-BuildRequires:	xorg-proto-glproto-devel >= 1.4.8
-BuildRequires:	xorg-proto-inputproto-devel >= 1.9.99.902
+BuildRequires:	xorg-proto-glproto-devel >= 1.4.16
+BuildRequires:	xorg-proto-inputproto-devel >= 2.2
 BuildRequires:	xorg-proto-kbproto-devel >= 1.0.3
 BuildRequires:	xorg-proto-printproto-devel
-BuildRequires:	xorg-proto-randrproto-devel >= 1.2.99.3
-%{?with_record:BuildRequires:	xorg-proto-recordproto-devel}
+BuildRequires:	xorg-proto-randrproto-devel >= 1.4.0
+%{?with_record:BuildRequires:	xorg-proto-recordproto-devel >= 1.13.99.1}
 BuildRequires:	xorg-proto-renderproto-devel >= 0.11
-BuildRequires:	xorg-proto-resourceproto-devel
-BuildRequires:	xorg-proto-scrnsaverproto-devel >= 1.1.0
+BuildRequires:	xorg-proto-resourceproto-devel >= 1.2.0
+BuildRequires:	xorg-proto-scrnsaverproto-devel >= 1.1
 BuildRequires:	xorg-proto-videoproto-devel
 BuildRequires:	xorg-proto-xcmiscproto-devel >= 1.2.0
-BuildRequires:	xorg-proto-xextproto-devel >= 1:7.0.99.3
-BuildRequires:	xorg-proto-xf86bigfontproto-devel
-BuildRequires:	xorg-proto-xf86dgaproto-devel
-BuildRequires:	xorg-proto-xf86driproto-devel >= 2.0.4
+BuildRequires:	xorg-proto-xextproto-devel >= 1:7.2.0
+%{?with_xf86bigfont:BuildRequires:	xorg-proto-xf86bigfontproto-devel >= 1.2.0}
+BuildRequires:	xorg-proto-xf86dgaproto-devel >= 2.0.99.1
+BuildRequires:	xorg-proto-xf86driproto-devel >= 2.1.0
 BuildRequires:	xorg-proto-xf86miscproto-devel
-BuildRequires:	xorg-proto-xf86vidmodeproto-devel
+BuildRequires:	xorg-proto-xf86vidmodeproto-devel >= 2.2.99.1
 BuildRequires:	xorg-proto-xineramaproto-devel
-BuildRequires:	xorg-proto-xproto-devel >= 7.0.13
-BuildRequires:	xorg-util-util-macros >= 1.5
-#BR: xcalibrateproto, tslib (for KDRIVE only)
-#BR: glitz-devel >= 0.4.3 (for XGL and EGL only)
+BuildRequires:	xorg-proto-xproto-devel >= 7.0.22
+BuildRequires:	xorg-sgml-doctools >= 1.8
+BuildRequires:	xorg-util-util-macros >= 1.14
+#BR: tslib (for KDRIVE only)
 Requires(triggerpostun):	sed >= 4.0
-Requires:	pixman >= 0.16.0
+Requires:	pixman >= %{pixman_ver}
 Requires:	xkeyboard-config
 # for rgb.txt
 Requires:	xorg-app-rgb >= 0.99.3
 Requires:	xorg-app-xkbcomp
-%{?with_hal:Suggests:	dbus}
 %{?with_hal:Suggests:	hal}
-%{?with_udev:Suggests:	udev-core}
-Suggests:	udev-acl
+Suggests:	udev-acl >= 1:143
+%{?with_udev:Suggests:	udev-core >= 1:143}
 Suggests:	xorg-driver-input-evdev
 # 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
+Suggests:	dbus-x11 >= 1.0
 Suggests:	xkeyboard-config
+# Usual desktop setups need least one video driver to run, see xorg.log which one exactly
+Suggests:	xorg-driver-video
 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}
+Provides:	xorg-xserver-module(dri)
+Provides:	xorg-xserver-libdri = %{version}-%{release}
 Obsoletes:	X11-Xserver < 1:7.0.0
 Obsoletes:	X11-driver-i2c < 1:7.0.0
 Obsoletes:	X11-modules < 1:7.0.0
@@ -137,6 +155,7 @@ Obsoletes:	XFree86-modules < 1:7.0.0
 Obsoletes:	XFree86-setup < 1:7.0.0
 Obsoletes:	Xserver
 Obsoletes:	xorg-xserver-server-xorgcfg
+Obsoletes:	xorg-xserver-libdri
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # avoid self-dependencies on included modules
@@ -196,7 +215,7 @@ Xnest - це сервер X Window System, який працює у вікні X
 Summary:	Xephyr - nested X server
 Summary(pl.UTF-8):	Xephyr - zagnieżdżony serwer X
 Group:		X11/Servers
-Requires:	pixman >= 0.15.0
+Requires:	pixman >= %{pixman_ver}
 
 %description -n xorg-xserver-Xephyr
 Xephyr is a a kdrive server that outputs to a window on a pre-existing
@@ -261,22 +280,41 @@ 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 -n xorg-xserver-Xvfb-init
+Summary:	Init scripts for Xvfb
+Summary(pl.UTF-8):	Skrypty startowe dla Xvfb
+Group:		X11/Servers
+Requires:	xorg-xserver-Xvfb
+
+%description -n xorg-xserver-Xvfb-init
+This package contains init scripts for Xvfb and registers Xvfb as
+system service.
+
+%description -n xorg-xserver-Xvfb-init -l pl.UTF-8
+Ten pakiet zawiera skrypty startowe dla Xvfb oraz rejestruje Xvfb jako
+usługę systemową.
+
 %package devel
 Summary:	Header files for X.org server
 Summary(pl.UTF-8):	Pliki nagłówkowe dla serwera X.org
 Group:		X11/Development/Libraries
-Requires:	libdrm-devel >= 2.4.5
-Requires:	pixman-devel >= 0.16.0
-Requires:	xorg-lib-libpciaccess-devel
+Requires:	libdrm-devel >= 2.4.39
+Requires:	pixman-devel >= %{pixman_ver}
+Requires:	xorg-lib-libpciaccess-devel >= 0.12.901
 Requires:	xorg-lib-libxkbfile-devel
-Requires:	xorg-proto-dri2proto-devel >= 2.1
+%{?with_dri2:Requires:	xorg-proto-dri2proto-devel >= 2.8}
 Requires:	xorg-proto-fontsproto-devel
-Requires:	xorg-proto-inputproto-devel >= 1.9.99.902
-Requires:	xorg-proto-randrproto-devel >= 1.2.99.3
-Requires:	xorg-proto-renderproto-devel >= 0.9.3
+Requires:	xorg-proto-inputproto-devel >= 2.2
+Requires:	xorg-proto-kbproto-devel >= 1.0.3
+Requires:	xorg-proto-randrproto-devel >= 1.4.0
+Requires:	xorg-proto-renderproto-devel >= 0.11
+Requires:	xorg-proto-resourceproto-devel >= 1.2.0
+Requires:	xorg-proto-scrnsaverproto-devel >= 1.1
 Requires:	xorg-proto-videoproto-devel
-Requires:	xorg-proto-xextproto-devel >= 1:7.0.99.3
-Requires:	xorg-proto-xproto-devel >= 7.0.13
+Requires:	xorg-proto-xextproto-devel >= 1:7.2.0
+Requires:	xorg-proto-xf86driproto-devel >= 2.1.0
+Requires:	xorg-proto-xineramaproto-devel
+Requires:	xorg-proto-xproto-devel >= 7.0.22
 Obsoletes:	X11-Xserver-devel < 1:7.0.0
 Obsoletes:	XFree86-Xserver-devel < 1:7.0.0
 
@@ -286,38 +324,27 @@ Header files for X.org server.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe dla serwera X.org.
 
-%package -n xorg-xserver-libdri
-Summary:	DRI extension library for X.org server
-Summary(pl.UTF-8):	Biblioteka rozszerzenia DRI dla serwera X.org
-Group:		X11/Servers
-Requires:	%{name} = %{version}-%{release}
-Provides:	xorg-xserver-module(dri)
-%if %{without multigl}
-Conflicts:	xorg-driver-video-fglrx-libdri
-Conflicts:	xorg-driver-video-nvidia
-%endif
+%package source
+Summary:	X.org server source code
+Summary(pl.UTF-8):	Pliki źródłowe dla serwera X.org
+Group:		X11/Development/Libraries
 
-%description -n xorg-xserver-libdri
-DRI extension library for X.org server.
+%description source
+X.org server source code.
 
-%description -n xorg-xserver-libdri -l pl.UTF-8
-Biblioteka rozszerzenia DRI dla serwera X.org.
+%description source -l pl.UTF-8
+Pliki źródłowe dla serwera X.org.
 
 %package -n xorg-xserver-libglx
 Summary:	GLX extension library for X.org server
 Summary(pl.UTF-8):	Biblioteka rozszerzenia GLX dla serwera X.org
 Group:		X11/Servers
 Requires:	%{name} = %{version}-%{release}
-Requires:	xorg-xserver-libdri = %{version}-%{release}
 # Mesa version glapi tables in glx/ dir come from
 Provides:	xorg-xserver-libglx(glapi) = 7.1.0
 Provides:	xorg-xserver-module(glx)
 Obsoletes:	X11-OpenGL-core < 1:7.0.0
 Obsoletes:	XFree86-OpenGL-core < 1:7.0.0
-%if %{without multigl}
-Conflicts:	xorg-driver-video-fglrx-libglx
-Conflicts:	xorg-driver-video-nvidia
-%endif
 
 %description -n xorg-xserver-libglx
 GLX extension library for X.org server.
@@ -329,9 +356,14 @@ Biblioteka rozszerzenia GLX dla serwera X.org.
 %setup -q -n xorg-server-%{version}
 %patch0 -p0
 %patch1 -p1
-%patch2 -p1
+
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+
+#unfortunately breaks build
+#patch7 -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
@@ -373,25 +405,26 @@ fi
 %configure \
 	--with-os-name="PLD/Linux" \
 	--with-os-vendor="PLD/Team" \
-	--%{?with_dbus:en}%{!?with_dbus:dis}able-config-dbus \
-	%{!?with_hal:--disable-config-hal} \
-	--%{?with_udev:en}%{!?with_udev:dis}able-config-udev \
+	--without-fop \
+	%{?with_dbus:--enable-config-dbus} \
+	--enable-config-hal%{!?with_hal:=no} \
+	--enable-config-udev%{!?with_udev:=no} \
 	--enable-aiglx \
-	--enable-builddocs \
 	--enable-dga \
 	%{?with_dmx:--enable-dmx} \
 	--enable-glx-tls \
 	--enable-install-libxf86config \
 	%{?with_record:--enable-record} \
 	--enable-kdrive \
+	%{?with_xcsecurity:--enable-xcsecurity} \
 	--enable-xephyr \
+	%{?with_xf86bigfont:--enable-xf86bigfont} \
 	--enable-xfbdev \
+	%{?with_xselinux:--enable-xselinux} \
 	--enable-glx-tls \
-	--disable-xsdl \
 	--disable-xfake \
 	--enable-secure-rpc \
 	--%{?with_dri2:en}%{!?with_dri2:dis}able-dri2 \
-	--with-dri-driver-path=%{_libdir}/xorg/modules/dri \
 	--with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
 	--with-xkb-output=/var/lib/xkb
 
@@ -403,7 +436,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -D %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
+install -Dp %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xserver
 install -d $RPM_BUILD_ROOT/etc/{security/console.apps,X11/xorg.conf.d}
 install -d $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{dri,drivers,input}
 install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
@@ -413,24 +446,23 @@ install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{*,*/*}.{la,a}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/10-quirks.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/10-quirks.conf
 
-%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
+install -d $RPM_BUILD_ROOT/etc/rc.d/init.d
+install -d $RPM_BUILD_ROOT/etc/sysconfig
+install -p %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/Xvfb
+cp -p %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/Xvfb
+
+install -d $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
+cp -a * $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
+cd $RPM_BUILD_ROOT%{_usrsrc}/%{name}-%{version}
+%{__make} distclean
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+find -name '*.h' | xargs chmod a-x
 
 %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
@@ -441,9 +473,19 @@ if [ -f /etc/X11/xorg.conf ]; then
 	sed -i -e 's/^\s*Load\s*"xtrap".*$/#& # obsolete module/' /etc/X11/xorg.conf
 fi
 
+%post -n xorg-xserver-Xvfb-init
+/sbin/chkconfig --add Xvfb
+%service Xvfb restart
+
+%preun -n xorg-xserver-Xvfb-init
+if [ "$1" = "0" ]; then
+	%service -q Xvfb stop
+	/sbin/chkconfig --del Xvfb
+fi
+
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog
+%doc COPYING ChangeLog README
 %attr(755,root,root) %{_bindir}/X
 %attr(755,root,root) %{_bindir}/Xorg
 %attr(4755,root,root) %{_bindir}/Xwrapper
@@ -455,10 +497,6 @@ fi
 %dir %{_libdir}/xorg/modules/dri
 %dir %{_libdir}/xorg/modules/drivers
 %dir %{_libdir}/xorg/modules/extensions
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdbe.so
-%{?with_dri2:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri2.so}
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libextmod.so
-%{?with_record:%attr(755,root,root) %{_libdir}/xorg/modules/extensions/librecord.so}
 %dir %{_libdir}/xorg/modules/input
 %dir %{_libdir}/xorg/modules/multimedia
 %attr(755,root,root) %{_libdir}/xorg/modules/multimedia/*.so
@@ -480,6 +518,7 @@ fi
 %{_mandir}/man4/exa.4*
 %{_mandir}/man4/fbdevhw.4*
 %{_mandir}/man5/xorg.conf.5x*
+%{_mandir}/man5/xorg.conf.d.5x
 
 %if %{with dmx}
 %files -n xorg-xserver-Xdmx
@@ -521,22 +560,26 @@ fi
 %attr(755,root,root) %{_bindir}/Xvfb
 %{_mandir}/man1/Xvfb.1x*
 
+%files -n xorg-xserver-Xvfb-init
+%defattr(644,root,root,755)
+%attr(754,root,root) /etc/rc.d/init.d/Xvfb
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/Xvfb
+
 %files devel
 %defattr(644,root,root,755)
+%doc doc/{Xinput,Xserver-spec}.html
 %{_includedir}/xorg
 %{_libdir}/libxf86config.a
+%{_libdir}/libxf86config.la
 %{_aclocaldir}/xorg-server.m4
 %{_pkgconfigdir}/xorg-server.pc
 
-%files -n xorg-xserver-libdri
+%files source
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libdri.so
+# keep file perms from install time, but have default defattr to keep adapter happy
+%defattr(-,root,root,755)
+%{_usrsrc}/%{name}-%{version}
 
 %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