[xorg-x11-xkb-utils] - setxkbmap 1.2.0 - xkbcomp 1.2.0 - xkbutils 1.0.3 - xkbevd 1.1.1

[Peter Hutterer]

commit 4b961c84c4e93b3e2a051f6ccd6a5123fad919a4
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Nov 1 08:35:07 2010 +1000

    - setxkbmap 1.2.0
    - xkbcomp 1.2.0
    - xkbutils 1.0.3
    - xkbevd 1.1.1

 .gitignore                |    4 +
 sources                   |    8 +-
 xkbcomp-hex-parsing.patch |   67 ----
 xkbcomp-speed.patch       |  755 ---------------------------------------------
 xorg-x11-xkb-utils.spec   |   32 +-
 5 files changed, 22 insertions(+), 844 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0d52318..e184c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,7 @@ setxkbmap-1.1.0.tar.bz2
 xkbcomp-1.1.1.tar.bz2
 xkbevd-1.1.0.tar.bz2
 xkbutils-1.0.2.tar.bz2
+/setxkbmap-1.2.0.tar.bz2
+/xkbcomp-1.2.0.tar.bz2
+/xkbevd-1.1.1.tar.bz2
+/xkbutils-1.0.3.tar.bz2
diff --git a/sources b/sources
index a9a2314..7faef77 100644
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
 b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
-2f902e0a89aaf2b19e06e7f26c6efb3a  setxkbmap-1.1.0.tar.bz2
-38c387bacdc01038c8ac280588792bcf  xkbcomp-1.1.1.tar.bz2
-8d3c1485c2dd62ea7395a37377958a39  xkbevd-1.1.0.tar.bz2
-369a21641b7ca983d6641298e51d97f8  xkbutils-1.0.2.tar.bz2
+2f6df89201eb9a2cbfb905d6b82a191e  setxkbmap-1.2.0.tar.bz2
+0f55995cd8da9b2d88553e1a2e17cd0a  xkbcomp-1.2.0.tar.bz2
+699198865d6902c39e3c6a9693a6422d  xkbevd-1.1.1.tar.bz2
+52ad6d8d87577a8ac736ab5488bec210  xkbutils-1.0.3.tar.bz2
diff --git a/xorg-x11-xkb-utils.spec b/xorg-x11-xkb-utils.spec
index c7678ba..8660aa4 100644
--- a/xorg-x11-xkb-utils.spec
+++ b/xorg-x11-xkb-utils.spec
@@ -1,25 +1,19 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
-Version: 7.4
-Release: 9%{?dist}
+Version: 7.5
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # use the macro so the doc dir is changed automagically
-%define xkbutils_version 1.0.2
+%define xkbutils_version 1.0.3
 Source0: ftp://ftp.x.org/pub/individual/app/xkbutils-%{xkbutils_version}.tar.bz2
-Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.1.1.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.0.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.2.0.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.1.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.1.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.1.0.tar.bz2
-
-Patch0: xkbcomp-speed.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=638244
-# Key's defined using unicode hex codes has stopped working in some/all
-# layouts (e.g. ir and af layouts)
-Patch1: xkbcomp-hex-parsing.patch
+Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.2.0.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: byacc
@@ -55,10 +49,6 @@ X.Org X11 xkb gadgets
 
 %prep
 %setup -q -c %{name}-%{version} -a1 -a2 -a3 -a4
-pushd xkbcomp-*
-%patch0 -p1 -b .speeeeeed
-%patch1 -p1 -b .hex-parsing
-popd
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DHAVE_STRCASECMP -Os"
@@ -90,8 +80,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -n xorg-x11-xkb-extras
 %defattr(-,root,root,-)
-%doc xkbutils-%{xkbutils_version}/AUTHORS xkbutils-%{xkbutils_version}/COPYING xkbutils-%{xkbutils_version}/INSTALL
-%doc xkbutils-%{xkbutils_version}/NEWS xkbutils-%{xkbutils_version}/README
+%doc xkbutils-%{xkbutils_version}/COPYING
+%doc xkbutils-%{xkbutils_version}/README
 %{_bindir}/xkbbell
 %{_bindir}/xkbevd
 %{_bindir}/xkbprint
@@ -104,6 +94,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkbwatch.*
 
 %changelog
+* Mon Nov 01 2010 Peter Hutterer <peter.hutterer at redhat.com> 7.5-1
+- setxkbmap 1.2.0
+- xkbcomp 1.2.0
+- xkbutils 1.0.3
+- xkbevd 1.1.1
+
 * Mon Oct 11 2010 Peter Hutterer <peter.hutterer at redhat.com> 7.4-9
 - xkbcomp-hex-parsing.patch: fix up parsing of hex-code symbols (#638244)