#
# Conditional build:
%bcond_without glide # don't build glide driver
-
-#http://cambuca.ldhs.cetuc.puc-rio.br/multiuser/
+%bcond_without r300 # r300_dri.so
%bcond_with dualhead # apply dualhead patch
Summary: XOrg X11 Window System servers and basic programs
Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: X11
Version: 6.9.0
-Release: 0.1
+Release: 4
Epoch: 1
License: MIT/X Consortium/BSD (see README)
Group: X11
Patch27: %{name}-makefile-fastbuild.patch
Patch28: %{name}-dri-ffb-compile.patch
Patch29: %{name}-radeon-entervt.patch
+Patch30: %{name}-acpi_event_loop_fix.patch
# updated from http://dl.sourceforge.net/i810fb/i810fb-xfree86-420.tar.bz2 : i810fb-xfree420.diff
Patch31: %{name}-i810fb.patch
Patch50: %{name}-glibc-locale_sync.patch
# radeon
Patch69: %{name}-radeon-dynamic-clocks.patch
Patch71: %{name}-radeon-set-fb-location.patch
-
Patch72: http://glen.alkohol.ee/xkb/xorg.patch
+Patch73: %{name}-r300.patch
#head-patch
#ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
+BuildRequires: cpp
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: flex
Requires: %{name}-xauth = %{epoch}:%{version}-%{release}
Requires: pam >= 0.79.0
Provides: XFree86 = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86
Obsoletes: xpm-progs
Obsoletes: xterm
-Obsoletes: XFree86
# for /usr/X11R6/bin/mkfontdir
Obsoletes: XFree86-font-utils
%ifarch sparc sparc64 sparcv9
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-OpenGL-libGL
Obsoletes: X11-driver-firegl
Obsoletes: X11-driver-nvidia
+Obsoletes: XFree86-Mesa-libGL
+Obsoletes: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-firegl
Obsoletes: XFree86-driver-nvidia
Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Requires: OpenGL-devel-base
-Provides: OpenGL-devel = 1.5
Provides: OpenGL-GLU-devel = 1.3
Provides: OpenGL-GLX-devel = 1.4
+Provides: OpenGL-devel = 1.5
Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
Obsoletes: Mesa-devel
Obsoletes: XFree86-OpenGL-devel
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
-Provides: OpenGL-static = 1.5
Provides: OpenGL-GLU-static = 1.3
+Provides: OpenGL-static = 1.5
Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
Obsoletes: Mesa-static
Obsoletes: XFree86-OpenGL-static
Requires: X11-fonts-base
Requires: pam >= 0.79.0
Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-Xserver
Obsoletes: XFree86-Mono
Obsoletes: XFree86-SVGA
Obsoletes: XFree86-VGA16
Obsoletes: XFree86-Sun
Obsoletes: XFree86-Sun24
# still not supported in 4.2.0:
-#Obsoletes: XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
+#Obsoletes: XFree86-8514
+#Obsoletes: XFree86-AGX
+#Obsoletes: XFree86-Mach8
+#Obsoletes: XFree86-P9000
# (and many drivers from XF86_SVGA server... and some from others)
Obsoletes: XFree86-XF86Setup
+Obsoletes: XFree86-Xserver
Obsoletes: Xconfigurator
%description Xserver
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: fontconfig-devel >= 1:2.2.0
Provides: XFree86-devel = %{epoch}:%{version}-%{release}
+Provides: libXvMCW-devel
Provides: render = 0.8
Provides: xcursor-devel = 1.1.2
Provides: xft-devel = 2.1.6
#Provides: libXdamage-devel
#Provides: libXfixes-devel
#Provides: libXrender-devel
+Obsoletes: libXvMCW-devel
%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-devel
%endif
Summary(pl): Sterownik do kart ATI
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-i2c = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ATI
Obsoletes: XFree86-Mach32
Obsoletes: XFree86-Mach64
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: glibc >= 6:2.3.5-7.6
Provides: XFree86-libs = %{epoch}:%{version}-%{release}
-Provides: xcursor = 1.1.2
-Provides: xft = 2.1.6
-Provides: xpm
-Provides: xrender = 0.8.4
#Provides: libXcomposite
#Provides: libXdamage
#Provides: libXfixes
#Provides: libXrender
+Provides: libXvMCW
+Provides: xcursor = 1.1.2
+Provides: xft = 2.1.6
+Provides: xpm
+Provides: xrender = 0.8.4
+Obsoletes: libXvMCW
%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-libs
%endif
Obsoletes: Xft
Obsoletes: xcursor
Obsoletes: xft
+Obsoletes: xorg-x11-libs-data
Obsoletes: xpm
Obsoletes: xrender
Obsoletes: XFree86-xfs
Obsoletes: xfs
Obsoletes: xfsft
+Obsoletes: xorg-x11-xfs
%description xfs
This is a font server for XOrg X11. You can serve fonts to other X
rm -f xc/config/cf/host.def
%patch29 -p1
+%patch30 -p0
%patch31 -p0
# ankry, FIXME :)
# %patch50 -p1
# %patch71 -p0
%{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
+%{?with_r300:%patch73 -p1}
%{?with_dualhead:%patch100 -p1}
-
sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
xc/programs/xdm/*.* xc/programs/Xserver/os/*.*
PWD=`pwd`
%{__make} -C xc install install.man \
DESTDIR="$RPM_BUILD_ROOT" \
- DOCDIR="/usr/share/doc/%{name}-%{version}" \
+ DOCDIR="%{_docdir}/%{name}-%{version}" \
INSTBINFLAGS="-m 755" \
INSTPGMFLAGS="-m 755" \
RAWCPP="/lib/cpp" \
rm -f $RPM_BUILD_ROOT%{_libx11dir}/xkb/xkbcomp
ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp
-ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
+ln -sf %{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
rm -f $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
# resolve conflict with man-pages
mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
# help rpm to detect deps
chmod 755 $RPM_BUILD_ROOT%{_libdir}/modules/dri/*.so
-gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
+gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*
# don't gzip README.* files, they are needed by XF86Setup
-gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
+gunzip $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.*
install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-%{_lib}.conf
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
+%if %{with r300}
+%attr(755,root,root) %{_libdir}/modules/dri/r300_dri.so
+%endif
%endif
%{_mandir}/man4/radeon.4*