X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=X11.spec;h=adfb18f7afb3617b8cdd1256b88e6a5ddb50609a;hb=80a707b4a17aa3c12c444d323a1df7fc33091fc4;hp=be6935b1c1728a869d6f5fb6d173aa66ffa1ee99;hpb=ac7bda7a0752833477f3ec49d442af78d756e037;p=packages%2FX11.git

diff --git a/X11.spec b/X11.spec
index be6935b..adfb18f 100644
--- 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.1
+Release:	5
 Epoch:		1
 License:	MIT/X Consortium/BSD (see README)
 Group:		X11
@@ -76,6 +76,7 @@ Source50:	xcalc.png
 Source51:	xload.png
 Source52:	xmag.png
 Source53:	http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+Source54:	XvMCConfig
 # NoSource53-md5:	0c40bd4545aa630e139043c2b12f0807
 Patch1:		%{name}-PLD.patch
 Patch2:		%{name}-enableglide.patch
@@ -106,13 +107,17 @@ 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
+# https://bugs.freedesktop.org/show_bug.cgi?id=4320
+Patch32:	%{name}-compositefastpath.patch
 Patch50:	%{name}-glibc-locale_sync.patch
 Patch60:	%{name}-oldkeyb.patch
 Patch61:	%{name}-sparc64-asmfix.patch
 Patch62:	%{name}-sparc64-v9fix.patch
 Patch63:	%{name}-pci-build.patch
+Patch64:	%{name}-xkbcomp-level.patch
 # XFree86-tdfx-fix-vtswitch-font-corruption.patch - issue still not fixed,
 # but patch doesn't help either; however, it occurs in text mode only, not
 # with tdfxfb, which is worth using anyway
@@ -122,6 +127,7 @@ 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
+Patch74:	%{name}-unichrome.patch
 
 #head-patch
 #ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
@@ -144,7 +150,7 @@ BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	pam-devel
-BuildRequires:	rpmbuild(macros) >= 1.213
+BuildRequires:	rpmbuild(macros) >= 1.268
 BuildRequires:	utempter-devel
 BuildRequires:	zlib-devel
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
@@ -393,6 +399,7 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Provides:	XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
 Obsoletes:	X11-driver-firegl
 Obsoletes:	X11-driver-nvidia
+Obsoletes:	XFree86-Mesa-libGL
 Obsoletes:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-firegl
 Obsoletes:	XFree86-driver-nvidia
@@ -558,7 +565,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 +572,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,7 +680,6 @@ Group:		X11/Development/Libraries
 Requires:	%{name}-imake = %{epoch}:%{version}-%{release}
 Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	fontconfig-devel >= 1:2.2.0
-Requires:	pkgconfig
 Provides:	XFree86-devel = %{epoch}:%{version}-%{release}
 Provides:	libXvMCW-devel
 Provides:	render = 0.8
@@ -683,7 +692,6 @@ Provides:	xrender-devel = 0.8.4
 #Provides:	libXdamage-devel
 #Provides:	libXfixes-devel
 #Provides:	libXrender-devel
-Obsoletes:	libXvMCW-devel
 %ifarch sparc sparc64 sparcv9
 Obsoletes:	X11R6.1-devel
 %endif
@@ -694,6 +702,7 @@ Obsoletes:	XFree86-xft-devel
 Obsoletes:	XFree86-xft2-devel
 Obsoletes:	XFree86-xrender-devel
 Obsoletes:	Xft-devel
+Obsoletes:	libXvMCW-devel
 Obsoletes:	render
 Obsoletes:	xcursor-devel
 Obsoletes:	xft-devel
@@ -1458,7 +1467,6 @@ 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
@@ -1468,8 +1476,10 @@ Obsoletes:	XFree86-xft
 Obsoletes:	XFree86-xft2
 Obsoletes:	XFree86-xrender
 Obsoletes:	Xft
+Obsoletes:	libXvMCW
 Obsoletes:	xcursor
 Obsoletes:	xft
+Obsoletes:	xorg-x11-libs-data
 Obsoletes:	xpm
 Obsoletes:	xrender
 
@@ -1912,6 +1922,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
@@ -1979,7 +1990,9 @@ X11-libs.
 rm -f xc/config/cf/host.def
 
 %patch29 -p1
+%patch30 -p0
 %patch31 -p0
+%patch32 -p0
 # ankry, FIXME :)
 # %patch50 -p1
 %patch60 -p0
@@ -1987,6 +2000,7 @@ rm -f xc/config/cf/host.def
 # %patch61 -p1
 %patch62 -p1
 %patch63 -p1
+%patch64 -p1
 
 # FIXME, is this still needed?
 # %patch69 -p0
@@ -1995,6 +2009,8 @@ rm -f xc/config/cf/host.def
 %{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
 
 %{?with_r300:%patch73 -p1}
+%{?with_r300:%patch74 -p1}
+# patch74 required patch73
 %{?with_dualhead:%patch100 -p1}
 
 sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
@@ -2158,6 +2174,8 @@ echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-%{_lib}.conf
 
 chmod -R u+w $RPM_BUILD_ROOT
 
+cp -a %{SOURCE54} $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2192,18 +2210,16 @@ sed -i -e "/^%(echo %{_libdir} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
 %post xdm
 /sbin/chkconfig --add xdm
 if [ -f /var/lock/subsys/xdm ]; then
-	echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+	echo "Run \"/sbin/service xdm restart\" to restart xdm." >&2
 	echo "WARNING: it will terminate all sessions opened from xdm!" >&2
 else
-	echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
+	echo "Run \"/sbin/service xdm start\" to start xdm." >&2
 fi
 
 %preun xdm
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/xdm ]; then
-		/etc/rc.d/init.d/xdm stop >&2
-	fi
 	/sbin/chkconfig --del xdm
+	%service xdm stop
 fi
 
 %pre xfs
@@ -2212,17 +2228,11 @@ fi
 
 %post xfs
 /sbin/chkconfig --add xfs
-if [ -f /var/lock/subsys/xfs ]; then
-	/etc/rc.d/init.d/xfs restart >&2
-else
-	echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
-fi
+%service xfs restart "font server"
 
 %preun xfs
 if [ "$1" = "0" ]; then
-	if [ -f /var/lock/subsys/xfs ]; then
-		/etc/rc.d/init.d/xfs stop >&2
-	fi
+	%service xfs stop
 	/sbin/chkconfig --del xfs
 fi
 
@@ -2239,7 +2249,7 @@ fi
 %groupadd -P %{name}-xfs -g 56 -r -f xfs
 %useradd -P %{name}-xfs -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs
 /sbin/chkconfig --add xfs
-/etc/rc.d/init.d/xfs start >&2
+/sbin/service xfs start >&2
 
 %triggerpostun Xserver -- XFree86-Xserver
 if [ -s /etc/X11/XF86Config.rpmsave ]; then
@@ -2606,6 +2616,7 @@ fi
 %{_libx11dir}/getconfig
 
 %config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/XvMCConfig
 %attr(640,root,root) %config %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
@@ -3014,6 +3025,9 @@ fi
 %files driver-via
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/via_drv.so
+%ifarch %{ix86}
+%attr(755,root,root) %{_libdir}/modules/dri/unichrome_dri.so
+%endif
 %{_mandir}/man4/via.4*
 %endif