mharris 5efabee
%define pkgname xorg-server
mharris 382d04d
%define cvsdate xxxxxxxxxxx
Kristian Høgsberg ce50e2c
mharris 683564b
Summary:   X.Org X11 X server
mharris dc2469d
Name:      xorg-x11-server
mharris ecfa41e
Version:   1.0.1
mharris 361e746
Release:   2
mharris dc2469d
URL:       http://www.x.org
mharris 1bd453c
License:   MIT/X11
mharris dc2469d
Group:     User Interface/X
mharris 683564b
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
mharris 83c9ed8
mharris ecfa41e
Source0:   http://xorg.freedesktop.org/releases/X11R7.0/src/everything/%{pkgname}-%{version}.tar.bz2
mharris 83c9ed8
mharris 83c9ed8
Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch
mharris 83c9ed8
# https://bugs.freedesktop.org/show_bug.cgi?id=5093
mharris 83c9ed8
Patch1:    xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch
mharris 1651c54
# xorg-server-0.99.3-rgb.txt-dix-config-fix.patch is from post-RC2 CVS
mharris 1651c54
Patch2:    xorg-server-0.99.3-rgb.txt-dix-config-fix.patch
mharris a98a47a
Patch3:    xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
mharris 361e746
mharris 361e746
# Patches taken from xserver/xorg CVS HEAD, post-1.0.1
mharris 361e746
Patch100:  xorg-x11-server-1.0.1-fbpict-fix-rounding.patch
mharris 361e746
Patch101:  xorg-x11-server-1.0.1-SEGV-on-null-interface.patch
mharris 361e746
mharris 361e746
Patch1000:  xorg-redhat-die-ugly-pattern-die-die-die.patch
mharris dc2469d
mharris dc2469d
# INFO: We don't ship the X server on s390/s390x/ppc64
mharris 2cc7042
ExcludeArch: s390 s390x ppc64
mharris dc2469d
mharris 1651c54
%define moduledir	%{_libdir}/xorg/modules
mharris aa15493
%define sdkdir		%{_includedir}/xorg
mharris 9e7c1dd
mharris 9e7c1dd
%ifarch %{ix86} x86_64 ppc ia64
mharris dc2469d
%define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest
mharris 9e7c1dd
%else
mharris 9e7c1dd
%define xservers --disable-xorg --disable-dmx --enable-xvfb --enable-xnest
mharris 9e7c1dd
%endif
mharris dc2469d
mharris 382d04d
# NOTE: The developer utils are intended for low level video driver hackers,
mharris 382d04d
# doing low level bit twiddling, who really know what they are doing, and are
mharris 382d04d
# disabled by default, as they are not generally useful to end users.
mharris 3a3aa5e
# FIXME: Reconfigure the spec file to put them in a separate subpackage, so
mharris 3a3aa5e
# I can build one build with them enabled, install them, then disable it again.
mharris 382d04d
%define with_developer_utils	0
mharris 382d04d
mharris 9e7c1dd
%ifarch %{ix86} x86_64 ppc ia64
mharris 382d04d
%define with_dri	1
mharris 382d04d
%else
mharris 382d04d
%define with_dri	0
mharris 382d04d
%endif
mharris 382d04d
mharris 382d04d
BuildRequires: pkgconfig
mharris 382d04d
BuildRequires: xorg-x11-util-macros >= 0.99.1
mharris dc2469d
BuildRequires: xorg-x11-proto-devel
mharris dc2469d
BuildRequires: xorg-x11-xtrans-devel
mharris 093a3e3
# FIXME: The version specification can be removed from here in the future,
mharris 093a3e3
# as it is not really mandatory, but forces a bugfix workaround on people who
mharris 093a3e3
# are using pre-rawhide modular X.
mharris 093a3e3
BuildRequires: libXfont-devel >= 0.99.2-3
mharris 683564b
BuildRequires: libXau-devel
mharris aa15493
BuildRequires: mesa-libGL-devel >= 6.4.1-1
mharris 683564b
BuildRequires: libxkbfile-devel
mharris b2db270
# libdmx-devel needed for Xdmx
mharris b2db270
BuildRequires: libdmx-devel
mharris 683564b
# libXdmcp-devel needed for Xdmx
mharris 683564b
BuildRequires: libXdmcp-devel
mharris 683564b
# libXmu-devel needed for Xdmx
mharris 683564b
BuildRequires: libXmu-devel
mharris 683564b
# libXext-devel needed for Xdmx
mharris 683564b
BuildRequires: libXext-devel
mharris 683564b
# libX11-devel needed for Xdmx
mharris 683564b
BuildRequires: libX11-devel
mharris 683564b
# libXrender-devel needed for Xdmx
mharris 683564b
BuildRequires: libXrender-devel
mharris 683564b
# libXi-devel needed for Xdmx
mharris 683564b
BuildRequires: libXi-devel
mharris 79994c0
# libXres-devel needed for something that links to libXres that I never bothered to figure out yet
mharris 79994c0
BuildRequires: libXres-devel
mharris 683564b
# libfontenc-devel needed for Xorg, but not specified by
mharris dc2469d
# upstream deps.  Build fails without it.
mharris 683564b
BuildRequires: libfontenc-devel
Kristian Høgsberg d16f815
# liblbxutil-devel needed for lbx
Kristian Høgsberg d16f815
BuildRequires: liblbxutil-devel
mharris a4f0d38
# Required for Xtst examples
mharris a4f0d38
BuildRequires: libXtst-devel
Kristian Høgsberg d16f815
# For Xdmxconfig 
Kristian Høgsberg d16f815
BuildRequires: libXt-devel libXpm-devel libXaw-devel
mharris aa15493
# To query fontdir from fontutil.pc
mharris aa15493
BuildRequires: xorg-x11-font-utils >= 1.0.0-1
mharris 382d04d
# Needed at least for DRI enabled builds
mharris 382d04d
%if %{with_dri}
mharris aa15493
BuildRequires: mesa-source >= 6.4.1-1
mharris aa15493
BuildRequires: libdrm-devel >= 2.0-1
mharris 382d04d
%endif
mharris dc2469d
%description
mharris 683564b
X.Org X11 X server
mharris dc2469d
mharris dc2469d
# ----- Xorg --------------------------------------------------------
mharris dc2469d
mharris dc2469d
%package Xorg
mharris 683564b
Summary: Xorg X server
mharris dc2469d
Group: User Interface/X
mharris 8ea210f
# NOTE: The X server invokes xkbcomp directly, so this is required.
mharris 8ea210f
Requires: xkbcomp
mharris 093a3e3
# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
mharris 093a3e3
# by xorg-x11-fonts-base
mharris 093a3e3
Requires: xorg-x11-fonts-base
mharris 5db2b3c
# NOTE: Require some basic drivers for minimal configuration. (#173060)
mharris 5db2b3c
Requires: xorg-x11-drv-mouse xorg-x11-drv-keyboard xorg-x11-drv-vesa
mharris a66ebcc
# NOTE: Require the driver meta-package to ensure that all drivers are always
mharris a66ebcc
# installed all of the time.  Why?  To guarantee that the drivers for your
mharris a66ebcc
# video and input devices are always installed all of the time, and ensure
mharris a66ebcc
# that OS installs and upgrades "work" without ending up with "oops, my
mharris a66ebcc
# driver isn't installed".  Drivers have always been "all installed" in
mharris a66ebcc
# every previous OS release, and this one is no different.  Drivers are split
mharris a66ebcc
# up into individual packages to facilitate making easy individual driver
mharris a66ebcc
# updates, NOT for allowing people to uninstall drivers to save $0.01 of
mharris a66ebcc
# hard disk space.  Why?  Because there is no "good" reason not to do so,
mharris a66ebcc
# necause 1Gb of hard disk space costs about $0.75 right now for starters.
mharris a66ebcc
Requires: xorg-x11-drivers >= 0.99.2-4
mharris a66ebcc
mharris 093a3e3
# NOTE: We use implementation non-specific "xkbdata" here, to make it easy
mharris 093a3e3
# to switch to the freedesktop.org 'xkeyboard-config' project replacment
mharris 093a3e3
# in the future.
mharris 093a3e3
Requires: xkbdata
mharris 093a3e3
# FIXME: Investigate these two and see what utils are needed, and use virtuals
mharris 83c9ed8
Requires: xorg-x11-server-utils >= 0.99.2-5
mharris 83c9ed8
Requires: xorg-x11-utils
mharris 093a3e3
# FIXME: This Requires on libXfont can be removed from here in the future,
mharris 093a3e3
# as it is not really mandatory, but forces a bugfix workaround on people who
mharris 093a3e3
# are using pre-rawhide modular X.
mharris 093a3e3
Requires: libXfont >= 0.99.2-3
mharris 093a3e3
mharris 093a3e3
Obsoletes: XFree86 xorg-x11
mharris 3fabd3e
# NOTE: This virtual provide should be used when one wants to depend on
mharris 3fabd3e
# the implementation specific (and optionally version specific) Xorg X
mharris 3fabd3e
# server, but in an OS packaging independent manner.  This futureproofs
mharris 3fabd3e
# package dependencies against possible future Xorg package renaming.
mharris 3fabd3e
Provides: Xorg = %{version}-%{release}
b363f21
Provides: Xserver
mharris dc2469d
mharris dc2469d
%description Xorg
mharris dc2469d
X.org X11 is an open source implementation of the X Window System.  It
mharris dc2469d
provides the basic low level functionality which full fledged
mharris dc2469d
graphical user interfaces (GUIs) such as GNOME and KDE are designed
mharris dc2469d
upon.
mharris dc2469d
mharris dc2469d
# ----- Xnest -------------------------------------------------------
mharris dc2469d
mharris dc2469d
%package Xnest
mharris dc2469d
Summary: A nested server.
mharris dc2469d
Group: User Interface/X
mharris 382d04d
#Requires: %{name} = %{version}-%{release}
mharris 8ea210f
Obsoletes: XFree86-Xnest, xorg-x11-Xnest
mharris 3fabd3e
# NOTE: This virtual provide should be used by packages which want to depend
mharris 3fabd3e
# on an implementation nonspecific Xnest X server.  It is intentionally not
mharris 3fabd3e
# versioned, since it should be agnostic.
mharris dc2469d
Provides: Xnest
mharris dc2469d
mharris dc2469d
%description Xnest
mharris dc2469d
Xnest is an X server, which has been implemented as an ordinary
mharris dc2469d
X application.  It runs in a window just like other X applications,
mharris dc2469d
but it is an X server itself in which you can run other software.  It
mharris dc2469d
is a very useful tool for developers who wish to test their
mharris dc2469d
applications without running them on their real X server.
mharris dc2469d
mharris dc2469d
# ----- Xdmx --------------------------------------------------------
mharris dc2469d
mharris dc2469d
%package Xdmx
mharris dc2469d
Summary: Distributed Multihead X Server and utilities
mharris dc2469d
Group: User Interface/X
mharris 382d04d
#Requires: %{name}-Xorg = %{version}-%{release}
mharris 1bd453c
Obsoletes: xorg-x11-Xdmx
mharris 3fabd3e
# NOTE: This virtual provide should be used by packages which want to depend
mharris 3fabd3e
# on an implementation nonspecific Xdmx X server.  It is intentionally not
mharris 3fabd3e
# versioned, since it should be agnostic.
mharris dc2469d
Provides: Xdmx
mharris dc2469d
mharris dc2469d
%description Xdmx
mharris dc2469d
Xdmx is proxy X server that provides multi-head support for multiple displays
mharris dc2469d
attached to different machines (each of which is running a typical X server).
mharris dc2469d
When Xinerama is used with Xdmx, the multiple displays on multiple machines
mharris dc2469d
are presented to the user as a single unified screen.  A simple application
mharris dc2469d
for Xdmx would be to provide multi-head support using two desktop machines,
mharris dc2469d
each of which has a single display device attached to it.  A complex
mharris dc2469d
application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
mharris dc2469d
(each attached to one of 16 computers) into a unified 5120x4096 display.
mharris dc2469d
mharris dc2469d
# ----- Xvfb --------------------------------------------------------
mharris dc2469d
mharris dc2469d
%package Xvfb
mharris dc2469d
Summary: A X Windows System virtual framebuffer X server.
mharris dc2469d
Group: User Interface/X
mharris dc2469d
Obsoletes: XFree86-Xvfb xorg-x11-Xvfb
mharris 3fabd3e
# NOTE: This virtual provide should be used by packages which want to depend
mharris 3fabd3e
# on an implementation nonspecific Xvfb X server.  It is intentionally not
mharris 3fabd3e
# versioned, since it should be agnostic.
mharris dc2469d
Provides: Xvfb
mharris dc2469d
mharris dc2469d
%description Xvfb
mharris dc2469d
Xvfb (X Virtual Frame Buffer) is an X server that is able to run on
mharris dc2469d
machines with no display hardware and no physical input devices.
mharris dc2469d
Xvfb simulates a dumb framebuffer using virtual memory.  Xvfb does
mharris dc2469d
not open any devices, but behaves otherwise as an X display.  Xvfb
mharris dc2469d
is normally used for testing servers.
mharris dc2469d
mharris dc2469d
# ----- sdk ---------------------------------------------------------
mharris dc2469d
mharris dc2469d
%package sdk
mharris dc2469d
Summary: SDK for X server driver module development
mharris dc2469d
Group: User Interface/X
mharris dc2469d
Obsoletes: XFree86-sdk xorg-x11-sdk
mharris 382d04d
Requires: xorg-x11-util-macros
mharris 83c9ed8
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
mharris dc2469d
mharris 1d1b706
Provides: libxf86config-devel = %{version}-%{release}
mharris 1d1b706
mharris dc2469d
%description sdk
mharris dc2469d
The SDK package provides the developmental files which are necessary for
mharris dc2469d
developing X server driver modules, and for compiling driver modules
mharris dc2469d
outside of the standard X11 source code tree.  Developers writing video
mharris dc2469d
drivers, input drivers, or other X modules should install this package.
mharris dc2469d
mharris dc2469d
# -------------------------------------------------------------------
mharris dc2469d
mharris dc2469d
%prep
mharris 5efabee
%setup -q -n %{pkgname}-%{version}
mharris 3a3aa5e
%patch0 -p0 -b .init-origins-fix
mharris aa15493
#%patch1 -p0 -b .fbmmx-fix-for-non-SSE-cpu
mharris aa15493
#%patch2 -p0 -b .rgb.txt-dix-config-fix
mharris a98a47a
%patch3 -p0 -b .parser-add-missing-headers-to-sdk
mharris dc2469d
mharris 361e746
%patch100 -p2 -b .fbpict-fix-rounding
mharris 361e746
%patch101 -p2 -b .SEGV-on-null-interface
mharris 361e746
mharris 361e746
%patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
mharris f7385e3
mharris dc2469d
%build
mharris 1651c54
#FONTDIR="${datadir}/X11/fonts"
mharris 1651c54
#DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
mharris 1651c54
mharris aa15493
#	--disable-dependency-tracking \
mharris aa15493
mharris a98a47a
automake-1.7 ; autoconf
mharris 683564b
%configure %{xservers} \
mharris 683564b
	--disable-xprint \
mharris 683564b
	--disable-static \
mharris 382d04d
	--enable-composite \
mharris 382d04d
	--enable-xtrap \
mharris 382d04d
	--enable-xcsecurity \
mharris 382d04d
	--enable-xevie \
mharris 382d04d
	--enable-lbx \
mharris 382d04d
%if %{with_dri}
mharris 382d04d
	--enable-dri \
mharris 382d04d
	--with-mesa-source=%{_datadir}/mesa/source \
mharris 382d04d
%endif
mharris 382d04d
	--with-module-dir=%{moduledir} \
mharris 382d04d
	--with-os-name="Fedora Core 5" \
mharris 382d04d
	--with-os-vendor="Red Hat, Inc." \
mharris 382d04d
	--with-xkb-output=%{_localstatedir}/lib/xkb \
mharris 83c9ed8
	--with-rgb-path=%{_datadir}/X11/rgb \
mharris aa15493
	--disable-xorgcfg \
mharris aa15493
	--enable-install-libxf86config \
mharris aa15493
	--with-fontdir=%(pkg-config --variable=fontdir fontutil)
mharris aa15493
mharris aa15493
mharris aa15493
#	sdkdir=%{sdkdir}
mharris 382d04d
mharris 093a3e3
make %{?_smp_mflags}
Kristian Høgsberg ce50e2c
mharris dc2469d
%install
mharris dc2469d
rm -rf $RPM_BUILD_ROOT
mharris aa15493
make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
mharris aa15493
# sdkdir=%{sdkdir}
Kristian Høgsberg ce50e2c
mharris 9e7c1dd
# Remove all libtool archives (*.la)
mharris 382d04d
find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
mharris dc2469d
mharris 9e7c1dd
# FIXME: This should be done upstream, so it's one less thing to hack.
mharris dc2469d
# Make these directories now so the Xorg package can own them.
mharris dc2469d
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
mharris dc2469d
mharris 382d04d
# FIXME: Remove unwanted files/dirs
mharris 382d04d
{
mharris 382d04d
    rm $RPM_BUILD_ROOT%{_bindir}/xorgconfig
mharris 382d04d
    rm $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1*
mharris 382d04d
    rm $RPM_BUILD_ROOT%{_libdir}/X11/Cards
mharris aa15493
    rm $RPM_BUILD_ROOT%{_libdir}/X11/Options
mharris 382d04d
    rm $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample
mharris 382d04d
    rm $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg
mharris bdcccdf
%if ! %{with_developer_utils}
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/inb
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/inl
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/inw
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/ioport
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/outb
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/outl
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/outw
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
mharris bdcccdf
%endif
mharris 382d04d
}
mharris 382d04d
mharris 9e7c1dd
# FIXME: Move/rename manpages to correct location (still broke in RC2)
mharris aa15493
%if 0
mharris 382d04d
{
mharris 158e1c9
    WRONG_DIR=$RPM_BUILD_ROOT%{_mandir}/man1
mharris 158e1c9
    MAN1X_DIR=$RPM_BUILD_ROOT%{_mandir}/man1x
mharris 158e1c9
mharris 158e1c9
    [ ! -d $MAN1X_DIR ] && mkdir -p $MAN1X_DIR
mharris 158e1c9
    mv ${WRONG_DIR}/* ${MAN1X_DIR}/
mharris 158e1c9
    for each in ${MAN1X_DIR}/* ; do
mharris 382d04d
        mv $each ${each/.1/.1x}
mharris 382d04d
    done
mharris 158e1c9
    rmdir $WRONG_DIR
mharris 382d04d
}
mharris 9e7c1dd
%endif
mharris 382d04d
mharris dc2469d
%clean
mharris dc2469d
rm -rf $RPM_BUILD_ROOT
mharris dc2469d
mharris dc2469d
mharris 3a3aa5e
mharris 3a3aa5e
%pre Xorg
mharris 3a3aa5e
{
mharris 3a3aa5e
  pushd /etc/X11
mharris 3a3aa5e
  # Migrate any pre-existing XFree86 4.x config file to xorg.conf if it
mharris 3a3aa5e
  # doesn't already exist, and rename any remaining XFree86 4.x congig files
mharris 3a3aa5e
  # to have .obsoleted file extensions, to help avoid end user confusion for
mharris 3a3aa5e
  # people unaware of the config file name change between server
mharris 3a3aa5e
  # implementations, and avoid bug reports.  If this turns out to confuse
mharris 3a3aa5e
  # users, I can modify it to add comments to the top of the obsoleted files
mharris 3a3aa5e
  # to point users to xorg.conf   <mharris@redhat.com>
mharris 3a3aa5e
  for configfile in XF86Config XF86Config-4 ; do
mharris 3a3aa5e
    if [ -r $configfile ]; then
mharris 3a3aa5e
      if [ -r xorg.conf ]; then
mharris 3a3aa5e
        mv -f $configfile $configfile.obsoleted
mharris 3a3aa5e
    else
mharris 3a3aa5e
        mv -f $configfile xorg.conf
mharris 3a3aa5e
      fi
mharris 3a3aa5e
    fi
mharris 3a3aa5e
  done
mharris 3a3aa5e
  # Massage pre-existing config files to work properly with X.org X11
mharris 3a3aa5e
  # - Remove xie and pex5 modules from the config files, as they are long
mharris 3a3aa5e
  #   since obsolete, and not provided since XFree86 4.2.0
mharris 3a3aa5e
  # - Remove Option "XkbRules" "xfree86" to help work around upgrade problems
mharris 3a3aa5e
  #   such as https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=120858
mharris 3a3aa5e
#  for configfile in xorg.conf ; do
mharris 3a3aa5e
    configfile="xorg.conf"
mharris 83c9ed8
    OLD_MODULEPATH="/usr/X11R6/lib/modules"
mharris 3a3aa5e
    if [ -r $configfile -a -w $configfile ]; then
mharris 3a3aa5e
      # Remove module load lines from the config file for obsolete modules
mharris 3a3aa5e
      perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' $configfile
mharris 3a3aa5e
      # Change the keyboard configuration from the deprecated "keyboard"
mharris 3a3aa5e
      # driver, to the newer "kbd" driver.
mharris 3a3aa5e
      perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' $configfile
mharris 3a3aa5e
      # Remove any Options "XkbRules" lines that may be present
mharris 3a3aa5e
      perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' $configfile
mharris 3a3aa5e
      # Remove RgbPath specifications from the config file as they are
mharris 3a3aa5e
      # unnecessary, and break upgrades from monolithic to modular X.
mharris 3a3aa5e
      # Fixes bugs (#173036, 173435, 173453, 173428)
mharris 3a3aa5e
      perl -p -i -e 's#^\s*RgbPath.*$##gi' $configfile
mharris 3a3aa5e
      # If ModulePath is specified in the config file, check for the old
mharris 3a3aa5e
      # monolithic module path, and replace it with the new one.
mharris 83c9ed8
      perl -p -i -e "m,^\s*ModulePath.*\"${OLD_MODULEPATH}\".*$,; s,${OLD_MODULEPATH},%{moduledir}," $configfile
mharris 3a3aa5e
    fi
mharris 3a3aa5e
#  done
mharris 3a3aa5e
  popd
mharris 3a3aa5e
mharris 3a3aa5e
# FIXME: I don't think this is needed anymore.  We'll block it for now and see what breaks.
mharris 3a3aa5e
%if 0
mharris 3a3aa5e
  # Do this for upgrades or installs
mharris 3a3aa5e
  XKB_DIR=%{_x11datadir}/X11/xkb/compiled
mharris 3a3aa5e
  if [ ! -L $XKB_DIR -a -d $XKB_DIR ]; then
mharris 3a3aa5e
    mkdir -p /var/lib/xkb
mharris 3a3aa5e
    mv -f $XKB_DIR /var/lib/xkb/
mharris 3a3aa5e
    ln -sf ../../../../../var/lib/xkb $XKB_DIR
mharris 3a3aa5e
  fi
mharris 3a3aa5e
%endif
mharris 3a3aa5e
} &> /dev/null || :
mharris 3a3aa5e
mharris 3a3aa5e
mharris dc2469d
# ----- Xorg --------------------------------------------------------
mharris dc2469d
mharris dc2469d
%files Xorg
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
# FIXME: The build fails to find the Changelog for some reason.
mharris dc2469d
#%doc ChangeLog
mharris dc2469d
%dir %{_bindir}
mharris af712a9
%{_bindir}/X
add023b
%attr(4711, root, root) %{_bindir}/Xorg
mharris 382d04d
%{_bindir}/getconfig
mharris 382d04d
%{_bindir}/getconfig.pl
mharris 382d04d
%{_bindir}/gtf
mharris 382d04d
%if %{with_developer_utils}
mharris 382d04d
%{_bindir}/inb
mharris 382d04d
%{_bindir}/inl
mharris 382d04d
%{_bindir}/inw
mharris 382d04d
%{_bindir}/ioport
mharris 382d04d
%{_bindir}/outb
mharris 382d04d
%{_bindir}/outl
mharris 382d04d
%{_bindir}/outw
mharris 382d04d
%{_bindir}/pcitweak
mharris 382d04d
%endif
mharris 382d04d
%{_bindir}/scanpci
mharris dc2469d
%dir %{_libdir}/xorg
mharris dc2469d
%dir %{_libdir}/xorg/modules
mharris dc2469d
%dir %{_libdir}/xorg/modules/drivers
mharris 382d04d
%dir %{_libdir}/xorg/modules/extensions
mharris aa15493
%{_libdir}/xorg/modules/extensions/libGLcore.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/libdbe.so
mharris 382d04d
%{_libdir}/xorg/modules/extensions/libdri.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/libextmod.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/libglx.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/librecord.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/libxtrap.so
mharris dc2469d
%dir %{_libdir}/xorg/modules/input
mharris aa15493
%dir %{_libdir}/xorg/modules/fonts
mharris aa15493
%{_libdir}/xorg/modules/fonts/libbitmap.so
mharris aa15493
%{_libdir}/xorg/modules/fonts/libfreetype.so
mharris aa15493
%{_libdir}/xorg/modules/fonts/libtype1.so
mharris 382d04d
%dir %{_libdir}/xorg/modules/linux
mharris 382d04d
%{_libdir}/xorg/modules/linux/libdrm.so
mharris aa15493
%{_libdir}/xorg/modules/linux/libfbdevhw.so
mharris 382d04d
%dir %{_libdir}/xorg/modules/multimedia
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/bt829_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/fi1236_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/msp3430_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda8425_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda9850_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda9885_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/uda1380_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/libafb.so
mharris 382d04d
%{_libdir}/xorg/modules/libcfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libcfb16.so
mharris 382d04d
%{_libdir}/xorg/modules/libcfb24.so
mharris 382d04d
%{_libdir}/xorg/modules/libcfb32.so
mharris 382d04d
%{_libdir}/xorg/modules/libddc.so
mharris 382d04d
%{_libdir}/xorg/modules/libexa.so
mharris 382d04d
%{_libdir}/xorg/modules/libfb.so
mharris aa15493
%{_libdir}/xorg/modules/libi2c.so
mharris 382d04d
%{_libdir}/xorg/modules/libint10.so
mharris 382d04d
%{_libdir}/xorg/modules/liblayer.so
mharris 382d04d
%{_libdir}/xorg/modules/libmfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libpcidata.so
mharris 382d04d
%{_libdir}/xorg/modules/librac.so
mharris 382d04d
%{_libdir}/xorg/modules/libramdac.so
mharris 382d04d
%{_libdir}/xorg/modules/libscanpci.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadow.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadowfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libvbe.so
mharris 382d04d
%{_libdir}/xorg/modules/libvgahw.so
mharris 382d04d
%{_libdir}/xorg/modules/libxaa.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf1bpp.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf4bpp.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf8_16bpp.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf8_32bpp.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf8_32wid.so
mharris bdcccdf
%dir %{_libdir}/xserver
mharris bdcccdf
%{_libdir}/xserver/SecurityPolicy
mharris 382d04d
%dir %{_mandir}
mharris aa15493
%dir %{_mandir}/man1
mharris aa15493
%{_mandir}/man1/getconfig.1x*
mharris aa15493
%{_mandir}/man1/gtf.1x*
mharris aa15493
%{_mandir}/man1/pcitweak.1x*
mharris aa15493
%{_mandir}/man1/scanpci.1x*
mharris aa15493
%{_mandir}/man1/Xorg.1x*
mharris aa15493
%{_mandir}/man1/Xserver.1x*
mharris aa15493
%dir %{_mandir}/man4
mharris aa15493
#%{_mandir}/man4/fbdevhw.4x*
mharris aa15493
%{_mandir}/man4/fbdevhw.4*
mharris aa15493
%dir %{_mandir}/man5
mharris aa15493
%{_mandir}/man5/getconfig.5x*
mharris aa15493
%{_mandir}/man5/xorg.conf.5x*
mharris 382d04d
%dir %{_localstatedir}/lib/xkb
mharris 382d04d
%{_localstatedir}/lib/xkb/README.compiled
mharris dc2469d
mharris dc2469d
# ----- Xnest -------------------------------------------------------
mharris dc2469d
mharris dc2469d
%files Xnest
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%dir %{_bindir}
mharris dc2469d
%{_bindir}/Xnest
mharris 382d04d
%dir %{_mandir}
mharris aa15493
%dir %{_mandir}/man1
mharris aa15493
%{_mandir}/man1/Xnest.1x*
mharris dc2469d
mharris dc2469d
# ----- Xdmx --------------------------------------------------------
mharris dc2469d
mharris dc2469d
%files Xdmx
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%dir %{_bindir}
mharris dc2469d
%{_bindir}/Xdmx
mharris 382d04d
%{_bindir}/dmxaddinput
mharris 382d04d
%{_bindir}/dmxaddscreen
mharris 382d04d
%{_bindir}/dmxreconfig
mharris 382d04d
%{_bindir}/dmxresize
mharris 382d04d
%{_bindir}/dmxrminput
mharris 382d04d
%{_bindir}/dmxrmscreen
mharris 382d04d
%{_bindir}/dmxtodmx
mharris 382d04d
%{_bindir}/dmxwininfo
mharris 382d04d
%{_bindir}/vdltodmx
mharris 382d04d
%{_bindir}/xdmx
mharris 382d04d
%{_bindir}/xdmxconfig
mharris 382d04d
%dir %{_mandir}
mharris aa15493
%dir %{_mandir}/man1
mharris aa15493
%{_mandir}/man1/Xdmx.1x*
mharris aa15493
%{_mandir}/man1/dmxtodmx.1x*
mharris aa15493
%{_mandir}/man1/vdltodmx.1x*
mharris aa15493
%{_mandir}/man1/xdmxconfig.1x*
mharris dc2469d
mharris dc2469d
# ----- Xvfb --------------------------------------------------------
mharris dc2469d
mharris dc2469d
%files Xvfb
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%dir %{_bindir}
mharris dc2469d
%{_bindir}/Xvfb
mharris 382d04d
%dir %{_mandir}
mharris aa15493
%dir %{_mandir}/man1
mharris aa15493
%{_mandir}/man1/Xvfb.1x*
mharris dc2469d
mharris dc2469d
# ----- sdk ---------------------------------------------------------
mharris dc2469d
mharris dc2469d
%files sdk
mharris dc2469d
%defattr(-,root,root,-)
mharris aa15493
%{_libdir}/libxf86config.a
mharris dc2469d
%dir %{_libdir}/pkgconfig
mharris dc2469d
%{_libdir}/pkgconfig/xorg-server.pc
mharris 0a0dee1
%dir %{_includedir}/xorg
mharris aa15493
#%dir %{_includedir}/xorg/sdk
mharris 1651c54
%{sdkdir}/*.h
mharris af712a9
%{_datadir}/aclocal/xorg-server.m4
mharris dc2469d
mharris dc2469d
# -------------------------------------------------------------------
mharris dc2469d
mharris dc2469d
%changelog
mharris 361e746
* Sun Feb  5 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
mharris 361e746
- Added xorg-x11-server-1.0.1-fbpict-fix-rounding.patch from CVS HEAD.
mharris 361e746
- Added xorg-x11-server-1.0.1-SEGV-on-null-interface.patch which prevents a
mharris 361e746
  SEGV on null interfaces (#174279,178986)
mharris 361e746
mharris ecfa41e
* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-1
mharris ecfa41e
- Updated to xserver 1.0.1 from X11R7.0
mharris ecfa41e
mharris 1d1b706
* Thu Dec 22 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-3
mharris 1d1b706
- Added "Provides: libxf86config-devel = %{version}-%{release}" to sdk package.
mharris 1d1b706
mharris a98a47a
* Wed Dec 21 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-2
mharris a98a47a
- Added xserver-1.0.0-parser-add-missing-headers-to-sdk.patch to provide the
mharris a98a47a
  necessary libxf86config.a headers to be able to use the library. (#173084)
mharris a98a47a
mharris aa15493
* Sat Dec 17 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
mharris a98a47a
- Updated to xserver 1.0.0 from X11R7 RC4
mharris a98a47a
- Removed the following patches, which are now integrated upstream:
mharris a98a47a
  - xorg-server-0.99.3-rgb.txt-dix-config-fix.patch,
mharris a98a47a
  - xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch
mharris a98a47a
- Changed manNx directories to manN to match upstream defaults.
mharris a98a47a
- Added libxf86config.a to sdk subpackage.
mharris a98a47a
- Updated build dependency of "mesa-libGL-devel >= 6.4.1-1"
mharris a98a47a
- Added "BuildRequires: xorg-x11-font-utils >= 1.0.0-1" to be able to query
mharris a98a47a
  the fontdir from fontutil.pc which is implemented currently by a custom
mharris a98a47a
  patch.
mharris a98a47a
- Enable xtrap, xcsecurity, xevie, and lbx on all builds, not just DRI builds.
mharris a98a47a
- Fix sdk installation path, so that drivers can find the files again.
mharris a98a47a
- Update file manifest, to deal with X server modules that have moved to
mharris a98a47a
  a subdir, etc.
mharris aa15493
Kristian Høgsberg d16f815
* Mon Nov 28 2005 Kristian Høgsberg <krh@redhat.com>
Kristian Høgsberg d16f815
- Add a few missing BuildRequires.
Kristian Høgsberg d16f815
mharris 4fda388
* Fri Nov 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-9
mharris a66ebcc
- Added "Requires: xorg-x11-drivers >= 0.99.2-4" as a dependency of the Xorg
mharris a66ebcc
  subpackage, to ensure that anaconda installs all of the drivers during OS
mharris a66ebcc
  installs and upgrades, as requested by Jeremy Katz.
mharris 4fda388
mharris 642cde5
* Fri Nov 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-8
mharris 1651c54
- Added xorg-server-0.99.3-rgb.txt-dix-config-fix.patch which fixes the
mharris 1651c54
  --with-rgb-path option to actually *work*.
mharris 1651c54
- Updated libdrm dep to 1.0.5
mharris 1651c54
mharris 83c9ed8
* Wed Nov 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-7
mharris 83c9ed8
- Update xorg-x11-server-utils dep to 0.99.2-5 to ensure rgb.txt is installed
mharris 83c9ed8
  in correct location - _datadir/X11/rgb
mharris 83c9ed8
- Added --with-rgb-path configure option to specify _datadir/X11/rgb so the
mharris 83c9ed8
  X server finds the rgb.txt database properly, for bugs (#173453, 173435,
mharris 83c9ed8
  173428, 173483, 173734, 173737, 173594)
mharris 83c9ed8
- Added xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch to prevent SSE/MMX
mharris 83c9ed8
  code from being activated on non-capable VIA CPU. (#173384,fdo#5093)
mharris 83c9ed8
mharris 3a3aa5e
* Thu Nov 17 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-6
mharris 3a3aa5e
- Add the missing rpm pre script from monolithic xorg-x11 packaging,
mharris 3a3aa5e
  clean it up a bit, reorder it for slight performance gain.
mharris 3a3aa5e
- Add some perl magic to pre script to remove RgbPath from xorg.conf,
mharris 3a3aa5e
  in order to fix bug (#173036, 173435, 173453, 173428)
mharris 3a3aa5e
- Add more perl magic to pre script to update ModulePath to the new
mharris 3a3aa5e
  location if it is specified in xorg.conf.
mharris 3a3aa5e
- Added xorg-x11-server-0.99.3-init-origins-fix.patch ported from monolithic
mharris 3a3aa5e
  xorg-x11 package to fix Xinerama bug.
mharris f7385e3
- Added xorg-redhat-die-ugly-pattern-die-die-die.patch to kill the ugly grey
mharris f7385e3
  stipple once again for bug (#173423).
mharris 6f015dd
- Added "BuildRequires: libdrm-devel" for DRI enabled builds.
mharris 3a3aa5e
add023b
* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> - 0.99.3-5
mharris 3a3aa5e
- Xorg server should be suid for users to be able to run startx (#173064)
add023b
mharris 093a3e3
* Mon Nov 14 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-4
mharris 093a3e3
- Added temporary "BuildRequires: libXfont-devel >= 0.99.2-3" and
mharris 093a3e3
  "Requires: libXfont-devel >= 0.99.2-3" to ensure early-testers of
mharris 093a3e3
  pre-rawhide modular X have installed the work around for (#172997).
mharris 093a3e3
- Added implementation specific "Requires: xkbdata" to Xorg subpackage, as
mharris 093a3e3
  we want to ensure the xkb data files are present, but allow us the option
mharris 093a3e3
  of easily switching implementations to "xkeyboard-config" at a future
mharris 093a3e3
  date, if we decide to go that route.
mharris 093a3e3
- Re-enable _smp_mflags during build.
mharris 5db2b3c
- Added "Requires: xorg-x11-drv-vesa" to Xorg subpackage (#173060)
mharris 093a3e3
b363f21
* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> - 0.99.3-3
b363f21
- provide Xserver
b363f21
- add another requires for basic bits
b363f21
a57ecab
* Sun Nov 13 2005 Jeremy Katz <katzj@redhat.com> - 0.99.3-2
a57ecab
- add some deps to the Xorg subpackage for base fonts, keyboard and mouse 
mharris 83c9ed8
  drivers, and rgb.txt that the server really wont work without
a57ecab
mharris 9e7c1dd
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
mharris 9e7c1dd
- Update to xorg-server-0.99.3 from X11R7 RC2.
mharris af712a9
- Add xorg-server.m4 to sdk subpackage, and "X" symlink to Xorg subpackage.
mharris 9e7c1dd
mharris 8ea210f
* Thu Nov 10 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-4
mharris 8ea210f
- Added "Requires: xkbcomp" for Xorg server, as it invokes it internally.
mharris 8ea210f
mharris a4f0d38
* Wed Nov 9 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-3
mharris a4f0d38
- Added "BuildRequires: libXtst-devel" for Xtst examples.
mharris a4f0d38
mharris 3fabd3e
* Mon Nov 7 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
mharris 3fabd3e
- Added versioning to Xorg virtual Provide, to allow config tools and driver
mharris 3fabd3e
  packages to have version based requires.
mharris 3fabd3e
mharris 382d04d
* Thu Oct 27 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
mharris 382d04d
- Update to xorg-server-0.99.2 from X11R7 RC1.
mharris 382d04d
- Add "BuildRequires: xorg-x11-util-macros >= 0.99.1".
mharris 382d04d
- Add "BuildRequires: mesa-source >= 6.4-4" for DRI builds.
mharris 382d04d
- Added dmx related utilities to Xdmx subpackage.
mharris 382d04d
- Individually list each X server module in file manifest.
mharris 382d04d
- Hack man1 manpages to be installed into man1x.
mharris 382d04d
- Add the following ./configure options --disable-dependency-tracking,
mharris 382d04d
  --enable-composite, --enable-xtrap, --enable-xcsecurity, --enable-xevie,
mharris 382d04d
  --enable-lbx, --enable-dri, --with-mesa-source, --with-module-dir,
mharris 382d04d
  --with-os-name, --with-os-vendor, --with-xkb-output, --disable-xorgcfg
mharris 382d04d
- Added getconfig, scanpci et al to Xorg subpackage
mharris 382d04d
- Added inb, inl, inw, ioport, outboutl, outw, pcitweak utils to Xorg package
mharris 382d04d
  conditionally, defaulting to "off".  These utilities are potentially
mharris 382d04d
  dangerous and can physically damage hardware and/or destroy data, so are
mharris 382d04d
  not shipped by default.
mharris 79994c0
- Added "BuildRequires: libdmx-devel" for dmx utilities
mharris 79994c0
- Added "BuildRequires: libXres-devel" for Xres examples
mharris bdcccdf
- Added {_libdir}/xserver/SecurityPolicy to Xorg subpackage for XSECURITY
mharris 382d04d
mharris 1bd453c
* Mon Oct  3 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050830.2
mharris 1bd453c
- Fix license tag to be "MIT/X11"
mharris 1bd453c
- Change Xdmx subpackage to Obsolete xorg-x11-Xdmx instead of xorg-x11-Xnest
mharris 1bd453c
mharris 683564b
* Sun Oct  2 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050830.1
mharris 683564b
- Update BuildRequires for new library package naming (libX...)
mharris 683564b
- Use Fedora Extras style BuildRoot tag
mharris 683564b
- Invoke make with _smp_mflags to take advantage of SMP systems
mharris 683564b
mharris 683564b
* Tue Aug 30 2005 Kristian Hogsberg <krh@redhat.com> 0.99.1-2.cvs20050830
Kristian Høgsberg ce50e2c
- Go back to %spec -n, use new cvs snapshot that supports overriding
Kristian Høgsberg ce50e2c
  moduledir during make install, use %makeinstall.
Kristian Høgsberg ce50e2c
- Drop %{moduledir}/multimedia globs.
Kristian Høgsberg ce50e2c
mharris dc2469d
* Fri Aug 26 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050825.0
mharris dc2469d
- Added build dependency on xorg-x11-libfontenc-devel, as the build fails
mharris dc2469d
  half way through without it, even though upstream dependencies do not
mharris dc2469d
  specify it as required.
mharris dc2469d
mharris 683564b
* Tue Aug 23 2005 Kristian Hogsberg <krh@redhat.com> 0.99.1-1
mharris dc2469d
- Initial spec file for the modular X server.