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

[Adam Jackson]

commit 0f42625fdf04893092822e47a42990b0fa851fb3
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Nov 10 17:32:11 2011 -0500

    Move xinput and xkill here from xorg-x11-apps

 .gitignore                 |    2 ++
 sources                    |    2 ++
 xorg-x11-server-utils.spec |   21 ++++++++++++++++-----
 3 files changed, 20 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7936d34..5643c60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,3 +35,5 @@ xgamma-1.0.4.tar.bz2
 /iceauth-1.0.5.tar.bz2
 /sessreg-1.0.6.tar.bz2
 /xrandr-1.3.5.tar.bz2
+/xinput-1.5.3.tar.bz2
+/xkill-1.0.3.tar.bz2
diff --git a/sources b/sources
index 38f7fef..a913edd 100644
--- a/sources
+++ b/sources
@@ -12,3 +12,5 @@ d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 b78a2da4cf128775031a5a3422fc0b78  xsetroot-1.1.0.tar.bz2
 d44e0057d6722b25d5a314e82e0b7e7c  xset-1.2.2.tar.bz2
 ee97f0cbb80e321c914dc7bc5d49960a  xstdcmap-1.0.2.tar.bz2
+1e2f0ad4f3fa833b65c568907f171d28  xinput-1.5.3.tar.bz2
+e7f0d57b6ba49c384e9cf8c9ff3243c1  xkill-1.0.3.tar.bz2
diff --git a/xorg-x11-server-utils.spec b/xorg-x11-server-utils.spec
index 40b08c0..2aac292 100644
--- a/xorg-x11-server-utils.spec
+++ b/xorg-x11-server-utils.spec
@@ -5,7 +5,7 @@
 Summary: X.Org X11 X server utilities
 Name: xorg-x11-%{pkgname}
 Version: 7.5
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -24,6 +24,9 @@ Source12: http://www.x.org/pub/individual/app/xsetmode-1.0.0.tar.bz2
 Source13: http://www.x.org/pub/individual/app/xsetpointer-1.0.1.tar.bz2
 Source14: http://www.x.org/pub/individual/app/xsetroot-1.1.0.tar.bz2
 Source15: http://www.x.org/pub/individual/app/xstdcmap-1.0.2.tar.bz2
+Source16: http://www.x.org/pub/individual/app/xkill-1.0.3.tar.bz2
+Source17: http://www.x.org/pub/individual/app/xinput-1.5.3.tar.bz2
+
 # NOTE: Each upstream tarball has its own "PatchN" section, taken from
 # multiplying the "SourceN" line times 100.  Please keep them in this
 # order.  Also, please keep each patch specific to a single upstream tarball,
@@ -47,12 +50,13 @@ BuildRequires: libXcursor-devel
 
 # xrdb, sigh
 Requires: mcpp
-
-Requires: libXrandr >= 1.2.0 libXcursor
+# older -apps had xinput and xkill, moved them here because they're
+# a) universally useful and b) don't require Xaw
+Conflicts: xorg-x11-apps < 7.6-4
 
 Provides: iceauth rgb sessreg xgamma xhost
 Provides: xmodmap xrandr xrdb xrefresh xset xsetmode xsetpointer
-Provides: xsetroot xstdcmap
+Provides: xsetroot xstdcmap xinput xkill
 
 %description
 A collection of utilities used to tweak and query the runtime configuration
@@ -69,7 +73,7 @@ Utility to perform keystone adjustments on X screens.
 %endif
 
 %prep
-%setup -q -c %{name}-%{version} -a2 -a3 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15
+%setup -q -c %{name}-%{version} -a2 -a3 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 
 #patch1100 -p0 -b .datadir-rgbpath-fix
 
@@ -133,6 +137,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/showrgb
 %{_bindir}/xgamma
 %{_bindir}/xhost
+%{_bindir}/xinput
+%{_bindir}/xkill
 %{_bindir}/xmodmap
 %{_bindir}/xrandr
 %{_bindir}/xrdb
@@ -148,6 +154,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/showrgb.1*
 %{_mandir}/man1/xgamma.1*
 %{_mandir}/man1/xhost.1*
+%{_mandir}/man1/xinput.1*
+%{_mandir}/man1/xkill.1*
 %{_mandir}/man1/xmodmap.1*
 %{_mandir}/man1/xrandr.1*
 %{_mandir}/man1/xrdb.1*
@@ -165,6 +173,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Thu Nov 10 2011 Adam Jackson <ajax at redhat.com> 7.5-8
+- Move xinput and xkill here from xorg-x11-apps
+
 * Mon Oct 10 2011 Matěj Cepl <mcepl at redhat.com> - 7.5-7
 - Fix BuildRequires ... xbitmaps-devel does not exist anymore (RHBZ #744751)
 - Upgrade to the latest upstream iceauth, rgb, sessreg, and xrandr