- rel 4; fix acpid + X eating cpu issues

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index 4c99de82a2bc9da0ba0280081f6c1020b116a418..3ca532b5046ebf59340dd52ef08f75ff2a3801b8 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -28,7 +28,7 @@ Summary(uk):  
 Summary(zh_CN):        XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:          X11
 Version:       6.9.0
-Release:       1
+Release:       4
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -106,6 +106,7 @@ Patch26:    %{name}-xterm-256colors.patch
 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
@@ -151,9 +152,9 @@ Requires:   %{name}-libs = %{epoch}:%{version}-%{release}
 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
@@ -391,9 +392,10 @@ Summary(pl):       Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
 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
 
@@ -446,9 +448,9 @@ Group:              X11/Development/Libraries
 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
@@ -466,8 +468,8 @@ Summary:    X11R6 static libraries with OpenGL
 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
@@ -558,7 +560,6 @@ Requires:   /usr/X11R6/lib/X11/rgb.txt
 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
@@ -566,9 +567,13 @@ 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
@@ -670,8 +675,8 @@ Group:              X11/Development/Libraries
 Requires:      %{name}-imake = %{epoch}:%{version}-%{release}
 Requires:      %{name}-libs = %{epoch}:%{version}-%{release}
 Requires:      fontconfig-devel >= 1:2.2.0
-Provides:      libXvMCW-devel
 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
@@ -789,8 +794,8 @@ Summary:    ATI video driver
 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
@@ -1447,16 +1452,16 @@ Group:          X11/Libraries
 Requires(post,postun): /sbin/ldconfig
 Requires:      %{name}-common = %{epoch}:%{version}-%{release}
 Requires:      glibc >= 6:2.3.5-7.6
-Provides:      libXvMCW
 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
@@ -1469,6 +1474,7 @@ Obsoletes:        XFree86-xrender
 Obsoletes:     Xft
 Obsoletes:     xcursor
 Obsoletes:     xft
+Obsoletes:     xorg-x11-libs-data
 Obsoletes:     xpm
 Obsoletes:     xrender
 
@@ -1911,6 +1917,7 @@ Provides: xfs = %{epoch}:%{version}-%{release}
 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
@@ -1978,6 +1985,7 @@ X11-libs.
 rm -f xc/config/cf/host.def
 
 %patch29 -p1
+%patch30 -p0
 %patch31 -p0
 # ankry, FIXME :)
 # %patch50 -p1
@@ -2032,7 +2040,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
 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" \
@@ -2132,14 +2140,14 @@ ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libx11dir}/fonts
 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}
@@ -2147,10 +2155,10 @@ 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