- use %service

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index 68a10b43f969160c43812d5c081022dbd378d25f..adfb18f7afb3617b8cdd1256b88e6a5ddb50609a 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:       4
+Release:       5
 Epoch:         1
 License:       MIT/X Consortium/BSD (see README)
 Group:         X11
@@ -110,6 +110,8 @@ 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
@@ -148,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}
@@ -1990,6 +1992,7 @@ rm -f xc/config/cf/host.def
 %patch29 -p1
 %patch30 -p0
 %patch31 -p0
+%patch32 -p0
 # ankry, FIXME :)
 # %patch50 -p1
 %patch60 -p0
@@ -2207,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
@@ -2227,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
 
@@ -2254,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