-# TODO:
-# - Xdmx DDX (now disabled in configure)
-#
Summary: X.org server
-Summary(pl): Serwer X.org
+Summary(pl.UTF-8): Serwer X.org
Name: xorg-xserver-server
-Version: 0.99.2
-Release: 0.1
+Version: 1.4
+Release: 1
License: MIT
-Group: X11/Applications
-Source0: http://xorg.freedesktop.org/releases/X11R7.0-RC1/xserver/xorg-server-%{version}.tar.bz2
-# Source0-md5: 8467f86e0832a5c532b30387c82d1e49
-Source1: http://dl.sourceforge.net/mesa3d/MesaLib-6.3.2.tar.bz2
-# Source1-md5: 0df27701df0924d17ddf41185efa8ce1
+Group: X11/Servers
+Source0: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-%{version}.tar.bz2
+# Source0-md5: a06d9fe4f9f1d459ae02657f9ce64220
+%define mesa_version 7.0.1
+Source1: http://dl.sourceforge.net/mesa3d/MesaLib-%{mesa_version}.tar.bz2
+# Source1-md5: c056abd763e899114bf745c9eedbf9ad
+Source2: xserver.pamd
Patch0: %{name}-ncurses.patch
+Patch1: %{name}-xwrapper.patch
+# nasty hack for http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30052
+Patch2: %{name}-gcc-x86_64-workaround.patch
+Patch3: %{name}-link.patch
URL: http://xorg.freedesktop.org/
# for glx headers
-BuildRequires: Mesa-devel
+BuildRequires: OpenGL-GLX-devel
BuildRequires: autoconf >= 2.57
BuildRequires: automake
BuildRequires: cpp
-BuildRequires: libdrm-devel
+BuildRequires: dbus-devel
+BuildRequires: hal-devel
+BuildRequires: libdrm-devel >= 2.3.0
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-libXau-devel
BuildRequires: xorg-lib-libXaw-devel
BuildRequires: xorg-lib-libXdmcp-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
+BuildRequires: xorg-lib-libXt-devel >= 1.0.0
BuildRequires: xorg-lib-libXtst-devel
BuildRequires: xorg-lib-libXxf86dga-devel
BuildRequires: xorg-lib-libXxf86misc-devel
BuildRequires: xorg-lib-libfontenc-devel
BuildRequires: xorg-lib-liblbxutil-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
-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
+BuildRequires: xorg-proto-fixesproto-devel >= 4.0
+BuildRequires: xorg-proto-fontcacheproto-devel
BuildRequires: xorg-proto-fontsproto-devel
-BuildRequires: xorg-proto-glproto-devel >= 1.4.1
+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-randrproto-devel >= 1.2
BuildRequires: xorg-proto-recordproto-devel
-BuildRequires: xorg-proto-renderproto-devel
+BuildRequires: xorg-proto-renderproto-devel >= 0.9.3
BuildRequires: xorg-proto-resourceproto-devel
-BuildRequires: xorg-proto-scrnsaverproto-devel
+BuildRequires: xorg-proto-scrnsaverproto-devel >= 1.1.0
BuildRequires: xorg-proto-trapproto-devel
BuildRequires: xorg-proto-videoproto-devel
BuildRequires: xorg-proto-xcmiscproto-devel
BuildRequires: xorg-proto-xf86miscproto-devel
BuildRequires: xorg-proto-xf86vidmodeproto-devel
BuildRequires: xorg-proto-xineramaproto-devel
-BuildRequires: xorg-proto-xproto-devel
-BuildRequires: xorg-util-util-macros >= 0.99.1
+BuildRequires: xorg-proto-xproto-devel >= 7.0.9
+BuildRequires: xorg-util-util-macros >= 0.99.2
+# xcalibrateproto, tslib (for KDRIVE only)
+Requires: xkeyboard-config
+# glitz-devel >= 0.4.3 (for XGL and EGL only)
# for rgb.txt
-Requires: xorg-app-rgb
+Requires: xorg-app-rgb >= 0.99.3
+Requires: xorg-app-xkbcomp
# just for %{_includedir}/bitmaps dir
Requires: xorg-data-xbitmaps
+# 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
+# see hw/xfree86/common/xf86Module.h
+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
-X.org server.
+Xorg server is a generally used X server which uses display hardware.
+It requires proper driver for your display hardware.
+
+%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.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.UTF-8
+Xdmx - rozproszony, wielomonitorowy serwer X.
+
+%package -n xorg-xserver-Xnest
+Summary: Xnest - nested X server
+Summary(pl.UTF-8): Xnest - zagnieżdżony serwer X
+Group: X11/Servers
+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
+a 'nested' window server, actually a client of the real X server,
+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.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.
+
+%description -n xorg-xserver-Xnest -l ru.UTF-8
+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 керує вікнами та графічними запитами для
+своїх власних клієнтів.
-%description -l pl
-Serwer X.org.
+%package -n xorg-xserver-Xprt
+Summary: Xprt - Xprint server for X
+Summary(pl.UTF-8): Xprt - serwer Xprint dla X
+Group: X11/Servers
+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.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.UTF-8): Xvfb - serwer X z wirtualnym framebufferem
+Group: X11/Servers
+# 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
+capable of running on machines with no display hardware and no
+physical input devices. Xvfb emulates a dumb framebuffer using virtual
+memory. Xvfb doesn't open any devices, but behaves otherwise as an X
+display. Xvfb is normally used for testing servers. Using Xvfb, the
+mfb or cfb code for any depth can be exercised without using real
+hardware that supports the desired depths. Xvfb has also been used to
+test X clients against unusual depths and screen configurations, to do
+batch processing with Xvfb as a background rendering engine, to do
+load testing, to help with porting an X server to a new platform, and
+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.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
+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 -n xorg-xserver-libglx
+Summary: GLX extension library fo X.org server
+Summary(pl.UTF-8): Biblioteka rozszerzenia GLX dla serwera X.org
+Group: X11/Servers
+Requires: %{name} = %{version}-%{release}
+Provides: xorg-xserver-libglx(glapi) = %{mesa_version}
+Provides: xorg-xserver-modules-libglx
+Obsoletes: X11-OpenGL-core < 1:7.0.0
+Obsoletes: XFree86-OpenGL-core < 1:7.0.0
+Conflicts: xorg-driver-video-nvidia
+
+%description -n xorg-xserver-libglx
+GLX extension library fo X.org server.
+
+%description -n xorg-xserver-libglx -l pl.UTF-8
+Biblioteka rozszerzenia GLX dla serwera X.org.
+
+%define xorg_xserver_server_ansic_abi 0.3
+%define xorg_xserver_server_extension_abi 0.3
+%define xorg_xserver_server_font_abi 0.5
+%define xorg_xserver_server_videodrv_abi 2.0
+%define xorg_xserver_server_xinput_abi 2.0
%prep
%setup -q -a1 -n xorg-server-%{version}
%patch0 -p1
+%patch1 -p0
+%ifarch %{x8664} i486
+%patch2 -p1
+%endif
+%patch3 -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
+if API=$(awk '/#define ABI_ANSIC_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+ [ $API != %{xorg_xserver_server_ansic_abi} ]; then
+ echo "Set %%define xorg_xserver_server_ansic_abi to $API and rerun."
+ exit 1
+fi
+
+if API=$(awk '/#define ABI_EXTENSION_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+ [ $API != %{xorg_xserver_server_extension_abi} ]; then
+ echo "Set %%define xorg_xserver_server_extension_abi to $API and rerun."
+ exit 1
+fi
+
+if API=$(awk '/#define ABI_FONT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+ [ $API != %{xorg_xserver_server_font_abi} ]; then
+ echo "Set %%define xorg_xserver_server_font_abi to $API and rerun."
+ exit 1
+fi
+if API=$(awk '/#define ABI_VIDEODRV_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+ [ $API != %{xorg_xserver_server_videodrv_abi} ]; then
+ echo "Set %%define xorg_xserver_server_videodrv_abi to $API and rerun."
+ exit 1
+fi
+if API=$(awk '/#define ABI_XINPUT_VERSION/ { split($0,A,/[(,)]/); printf("%d.%d",A[2], A[3]); }' hw/xfree86/common/xf86Module.h) && \
+ [ $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 \
+ --with-os-name="PLD/Linux" \
+ --with-os-vendor="PLD/Team" \
+ --enable-aiglx \
+ --enable-builddocs \
--enable-dga \
+ --enable-dmx \
+ --enable-glx-tls \
--enable-lbx \
--enable-xevie \
- --enable-xtrap \
- --with-default-font-path="%{_fontsdir}/misc,%{_fontsdir}/TTF,%{_fontsdir}/OTF,%{_fontsdir}/Type1,%{_fontsdir}/CID,%{_fontsdir}/100dpi,%{_fontsdir}/75dpi" \
- --with-mesa-source="`pwd`/Mesa-6.3.2"
+ --enable-xprint \
+ --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-mesa-source="`pwd`/Mesa-%{mesa_version}" \
+ --with-xkb-output=/var/lib/xkb
%{__make}
rm -rf $RPM_BUILD_ROOT
%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT \
- drivermandir=%{_mandir}/man4 \
- filemandir=%{_mandir}/man5
+ DESTDIR=$RPM_BUILD_ROOT
+
+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/{dri,drivers,input}
+install hw/xfree86/parser/xf86Parser.h $RPM_BUILD_ROOT%{_includedir}/xorg/xf86Parser.h
+install hw/xfree86/parser/xf86Optrec.h $RPM_BUILD_ROOT%{_includedir}/xorg/xf86Optrec.h
+install hw/xfree86/parser/libxf86config.a $RPM_BUILD_ROOT%{_libdir}/libxf86config.a
+:> $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}
%files
%defattr(644,root,root,755)
-%doc ChangeLog
-%attr(755,root,root) %{_bindir}/*
-%{_includedir}/X11/bitmaps/*
-%{_includedir}/X11/pixmaps
+%doc COPYING
+%attr(755,root,root) %{_bindir}/X
+%attr(755,root,root) %{_bindir}/Xorg
+%attr(4755,root,root) %{_bindir}/Xwrapper
+%attr(755,root,root) %{_bindir}/cvt
+%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}/xorgconfig
%{_libdir}/X11/Cards
-%{_libdir}/X11/app-defaults/*
-%{_libdir}/X11/getconfig
-%{_libdir}/X11/xserver
-# broken symlinks:
-%exclude %{_libdir}/X11/xserver/C/print
+%{_libdir}/X11/Options
%dir %{_libdir}/xorg
%dir %{_libdir}/xorg/modules
-%attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
+%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
+%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
+%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
-%{_datadir}/X11/xkb/compiled
-%{_mandir}/man1/*.1*
-%{_mandir}/man4/*.4x*
-%{_mandir}/man5/*.5x*
+%attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
+%dir %{_libdir}/xserver
+%{_libdir}/xserver/SecurityPolicy
+%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/gtf.1x*
+%{_mandir}/man1/pcitweak.1x*
+%{_mandir}/man1/scanpci.1x*
+%{_mandir}/man1/xorgconfig.1*
+%{_mandir}/man4/exa.4*
+%{_mandir}/man4/fbdevhw.4*
+%{_mandir}/man5/xorg.conf.5x*
+%{_mandir}/man5/SecurityPolicy.5x*
+
+%files -n xorg-xserver-Xdmx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xdmx
+%attr(755,root,root) %{_bindir}/dmxaddinput
+%attr(755,root,root) %{_bindir}/dmxaddscreen
+%attr(755,root,root) %{_bindir}/dmxreconfig
+%attr(755,root,root) %{_bindir}/dmxresize
+%attr(755,root,root) %{_bindir}/dmxrminput
+%attr(755,root,root) %{_bindir}/dmxrmscreen
+%attr(755,root,root) %{_bindir}/dmxtodmx
+%attr(755,root,root) %{_bindir}/dmxwininfo
+%attr(755,root,root) %{_bindir}/vdltodmx
+%attr(755,root,root) %{_bindir}/xdmx
+%attr(755,root,root) %{_bindir}/xdmxconfig
+%{_mandir}/man1/Xdmx.1x*
+%{_mandir}/man1/dmxtodmx.1x*
+%{_mandir}/man1/vdltodmx.1x*
+%{_mandir}/man1/xdmxconfig.1x*
+
+%files -n xorg-xserver-Xnest
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xnest
+%{_mandir}/man1/Xnest.1x*
+
+%files -n xorg-xserver-Xprt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xprt
+%{_libdir}/X11/xserver
+%{_mandir}/man1/Xprt.1x*
+
+%files -n xorg-xserver-Xvfb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xvfb
+%{_mandir}/man1/Xvfb.1x*
%files devel
%defattr(644,root,root,755)
%{_includedir}/xorg
+%{_libdir}/libxf86config.a
+%{_aclocaldir}/xorg-server.m4
%{_pkgconfigdir}/xorg-server.pc
+
+%files -n xorg-xserver-libglx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/xorg/modules/extensions/libglx.so