[xorg-x11-server-utils] xmodmap 1.0.8

[Peter Hutterer]

commit 10f71d688c977cde2861b60cc2168fec099149f3
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Sep 9 10:26:57 2013 +1000

    xmodmap 1.0.8
    
    - xkill 1.0.4
    - xrdb 1.1.0

 .gitignore                      |    3 ++
 sources                         |    6 ++--
 xmodmap-1.0.7-fix-configh.patch |   57 ---------------------------------------
 xorg-x11-server-utils.spec      |   19 ++++++-------
 4 files changed, 15 insertions(+), 70 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8c590c8..6540fdc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,3 +48,6 @@ xgamma-1.0.4.tar.bz2
 /xmodmap-1.0.7.tar.bz2
 /xsetroot-1.1.1.tar.bz2
 /xstdcmap-1.0.3.tar.bz2
+/xrdb-1.1.0.tar.bz2
+/xmodmap-1.0.8.tar.bz2
+/xkill-1.0.4.tar.bz2
diff --git a/sources b/sources
index 6591a0c..9ec3bf6 100644
--- a/sources
+++ b/sources
@@ -1,16 +1,16 @@
 08e3f6b523da8b0af179f22f339508b2  iceauth-1.0.5.tar.bz2
-ed2e48cf33584455d74615ad4bbe4246  xrdb-1.0.9.tar.bz2
+b54c7e3e53b4f332d41ed435433fbda0  xrdb-1.1.0.tar.bz2
 2f63f88ad0dcecd33c8cf000f38e9250  xrefresh-1.0.4.tar.bz2
 d074e79d380b031d2f60e4cd56538c93  xsetmode-1.0.0.tar.bz2
 9e5bcbeda4aaf02bfa095e41d30baee4  xsetpointer-1.0.1.tar.bz2
 d44e0057d6722b25d5a314e82e0b7e7c  xset-1.2.2.tar.bz2
-e7f0d57b6ba49c384e9cf8c9ff3243c1  xkill-1.0.3.tar.bz2
+0ae6bc2a8d3af68e9c76b1a6ca5f7a78  xkill-1.0.4.tar.bz2
 d2459d35b4e0b41ded26a1d1159b7ac6  xinput-1.6.0.tar.bz2
 4d68317238bb14a33c0e419233d57d87  xrandr-1.4.0.tar.bz2
 bcd820d967eaa51bd25b86c0ee682d4e  rgb-1.0.5.tar.bz2
 f548e389ff68424947b87785df6a321b  sessreg-1.0.8.tar.bz2
 c06067f572bc4a5298f324f27340da95  xgamma-1.0.5.tar.bz2
 a0fcd2cb6ddd9f378944cc6f4f83cd7c  xhost-1.0.5.tar.bz2
-d9b65f6881afe0d6d9863b30e1081bde  xmodmap-1.0.7.tar.bz2
+5511da3361eea4eaa21427652c559e1c  xmodmap-1.0.8.tar.bz2
 7211b31ec70631829ebae9460999aa0b  xsetroot-1.1.1.tar.bz2
 eb5473acaef15a5db9b50df29c6a7f90  xstdcmap-1.0.3.tar.bz2
diff --git a/xorg-x11-server-utils.spec b/xorg-x11-server-utils.spec
index 6d7a9ee..d8fc0ee 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.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -15,20 +15,18 @@ Source2:  http://www.x.org/pub/individual/app/rgb-1.0.5.tar.bz2
 Source3:  http://www.x.org/pub/individual/app/sessreg-1.0.8.tar.bz2
 Source5:  http://www.x.org/pub/individual/app/xgamma-1.0.5.tar.bz2
 Source6:  http://www.x.org/pub/individual/app/xhost-1.0.5.tar.bz2
-Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.7.tar.bz2
+Source7:  http://www.x.org/pub/individual/app/xmodmap-1.0.8.tar.bz2
 Source8:  http://www.x.org/pub/individual/app/xrandr-1.4.0.tar.bz2
-Source9:  http://www.x.org/pub/individual/app/xrdb-1.0.9.tar.bz2
+Source9:  http://www.x.org/pub/individual/app/xrdb-1.1.0.tar.bz2
 Source10: http://www.x.org/pub/individual/app/xrefresh-1.0.4.tar.bz2
 Source11: http://www.x.org/pub/individual/app/xset-1.2.2.tar.bz2
 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.1.tar.bz2
 Source15: http://www.x.org/pub/individual/app/xstdcmap-1.0.3.tar.bz2
-Source16: http://www.x.org/pub/individual/app/xkill-1.0.3.tar.bz2
+Source16: http://www.x.org/pub/individual/app/xkill-1.0.4.tar.bz2
 Source17: http://www.x.org/pub/individual/app/xinput-1.6.0.tar.bz2
 
-Patch1: xmodmap-1.0.7-fix-configh.patch
-
 BuildRequires: xorg-x11-util-macros
 
 BuildRequires: pkgconfig(xmu) pkgconfig(xext) pkgconfig(xrandr)
@@ -71,10 +69,6 @@ Utility to perform keystone adjustments on X screens.
 %prep
 %setup -q -c %{name}-%{version} -a2 -a3 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17
 
-pushd xmodmap-*
-%patch1 -p1 -b .configh
-popd
-
 %build
 
 # Build all apps
@@ -166,6 +160,11 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Sep 09 2013 Peter Hutterer <peter.hutterer at redhat.com> 7.7-3
+- xmodmap 1.0.8
+- xkill 1.0.4
+- xrdb 1.1.0
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild