[xorg-x11-apps] Move xinput and xkill to xorg-x11-server-utils

[Adam Jackson]

commit a4004bfe7aeb057f1952f1127c64b40985e200e7
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Nov 10 16:46:52 2011 -0500

    Move xinput and xkill to xorg-x11-server-utils

 sources            |    2 --
 xorg-x11-apps.spec |   15 ++++++---------
 2 files changed, 6 insertions(+), 11 deletions(-)
---
diff --git a/sources b/sources
index ad5ab30..deeaa15 100644
--- a/sources
+++ b/sources
@@ -15,7 +15,5 @@ cb9377b09e562e4084cc614a44df2641  luit-1.1.0.tar.bz2
 76ac52710234ebb9d0e2762bb5d11ea1  xmessage-1.0.3.tar.bz2
 e40eeb4454f2a7cdde3a14f5dfd3aadd  xvidtune-1.0.2.tar.bz2
 b9102fe787eda2a1c9578079d8f55eed  xclipboard-1.1.1.tar.bz2
-1e2f0ad4f3fa833b65c568907f171d28  xinput-1.5.3.tar.bz2
-e7f0d57b6ba49c384e9cf8c9ff3243c1  xkill-1.0.3.tar.bz2
 a3035dcecdbdb89e864177c080924981  xeyes-1.1.1.tar.bz2
 c3ac3667a6f5c3cead9847fbf4b5f36e  x11perf-1.5.3.tar.bz2
diff --git a/xorg-x11-apps.spec b/xorg-x11-apps.spec
index 17169c8..b910202 100644
--- a/xorg-x11-apps.spec
+++ b/xorg-x11-apps.spec
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The package version should be set to the X11 major release from which
 # the OS release is based upon.
 Version: 7.6
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -25,12 +25,10 @@ Source8:  ftp://ftp.x.org/pub/individual/app/xclipboard-1.1.1.tar.bz2
 Source9:  ftp://ftp.x.org/pub/individual/app/xconsole-1.0.4.tar.bz2
 Source10: ftp://ftp.x.org/pub/individual/app/xcursorgen-1.0.4.tar.bz2
 Source11: ftp://ftp.x.org/pub/individual/app/xeyes-1.1.1.tar.bz2
-Source12: ftp://ftp.x.org/pub/individual/app/xkill-1.0.3.tar.bz2
 Source13: ftp://ftp.x.org/pub/individual/app/xload-1.1.0.tar.bz2
 Source14: ftp://ftp.x.org/pub/individual/app/xlogo-1.0.3.tar.bz2
 Source15: ftp://ftp.x.org/pub/individual/app/xmag-1.0.4.tar.bz2
 Source16: ftp://ftp.x.org/pub/individual/app/xmessage-1.0.3.tar.bz2
-Source17: ftp://ftp.x.org/pub/individual/app/xinput-1.5.3.tar.bz2
 Source18: ftp://ftp.x.org/pub/individual/app/xfd-1.1.0.tar.bz2
 Source19: ftp://ftp.x.org/pub/individual/app/xfontsel-1.0.3.tar.bz2
 Source20: ftp://ftp.x.org/pub/individual/app/xvidtune-1.0.2.tar.bz2
@@ -63,7 +61,7 @@ BuildRequires: libXxf86vm-devel
 BuildRequires: xorg-x11-xbitmaps
 
 Provides: luit oclock x11perf xbiff xclipboard xclock xconsole xcursorgen
-Provides: xeyes xkill xload xlogo xmag xmessage xpr xwd xwud xinput
+Provides: xeyes xload xlogo xmag xmessage xpr xwd xwud
 Provides: xfd xfontsel xvidtune
 
 # NOTE: xwd, xwud, luit used to be in these.
@@ -78,7 +76,7 @@ Conflicts: xorg-x11-server-utils < 7.4-8.fc12
 A collection of common X Window System applications.
 
 %prep
-%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20
+%setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a13 -a14 -a15 -a16 -a18 -a19 -a20
 %patch0 -p0 -b .x11perf-datadir-cleanups
 #%patch2 -p0 -b .streams-me-softer
 %patch6 -p1 -b .xmu-configure
@@ -127,8 +125,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/xeyes
 %{_bindir}/xfd
 %{_bindir}/xfontsel
-%{_bindir}/xinput
-%{_bindir}/xkill
 %{_bindir}/xload
 %{_bindir}/xlogo
 %{_bindir}/xmag
@@ -172,8 +168,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xeyes.1*
 %{_mandir}/man1/xfd.1*
 %{_mandir}/man1/xfontsel.1*
-%{_mandir}/man1/xinput.1*
-%{_mandir}/man1/xkill.1*
 %{_mandir}/man1/xload.1*
 %{_mandir}/man1/xlogo.1*
 %{_mandir}/man1/xmag.1*
@@ -184,6 +178,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xwud.1*
 
 %changelog
+* Thu Nov 10 2011 Adam Jackson <ajax at redhat.com> 7.6-4
+- Move xinput and xkill to xorg-x11-server-utils
+
 * Mon Nov 07 2011 Adam Jackson <ajax at redhat.com> 7.6-3
 - Rebuild for libpng 1.5