[xorg-x11-xkb-utils] X11R7.7 updates:

[Peter Hutterer]

commit 5e1002f6d3181f6e0055822cae1eedcf920cb9ef
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Jun 20 10:48:29 2012 +1000

    X11R7.7 updates:
    
    - xkbcomp 1.2.4
    - setxkbmap 1.3.0
    - xkbevd 1.1.3

 .gitignore              |   13 +++----------
 sources                 |    6 +++---
 xorg-x11-xkb-utils.spec |   27 ++++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b37ff2..8330ad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,8 @@
-xkbevd-1.0.2.tar.bz2
 xkbprint-1.0.1.tar.bz2
 xkbutils-1.0.1.tar.bz2
-xkbcomp-1.1.0.tar.bz2
-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
 /xkbprint-1.0.3.tar.bz2
-/xkbcomp-1.2.1.tar.bz2
-/xkbcomp-1.2.3.tar.bz2
+/setxkbmap-1.3.0.tar.bz2
+/xkbcomp-1.2.4.tar.bz2
+/xkbevd-1.1.3.tar.bz2
diff --git a/sources b/sources
index 94b0cd4..229f6a7 100644
--- a/sources
+++ b/sources
@@ -1,7 +1,7 @@
 b98ae2d8b21c545b7b322d0b302efefa  xkbprint-1.0.1.tar.bz2
-2f6df89201eb9a2cbfb905d6b82a191e  setxkbmap-1.2.0.tar.bz2
-885b4d8a7c8c7afb3312d31934cb3549  xkbcomp-1.2.1.tar.bz2
-699198865d6902c39e3c6a9693a6422d  xkbevd-1.1.1.tar.bz2
 52ad6d8d87577a8ac736ab5488bec210  xkbutils-1.0.3.tar.bz2
 526b5ba87cccd05aa700fa628bcfda3e  xkbprint-1.0.3.tar.bz2
 35622a497894c1cff9182d42696c3e27  xkbcomp-1.2.3.tar.bz2
+1001771344608e120e943a396317c33a  setxkbmap-1.3.0.tar.bz2
+a0fc1ac3fc4fe479ade09674347c5aa0  xkbcomp-1.2.4.tar.bz2
+37ed71525c63a9acd42e7cde211dcc5b  xkbevd-1.1.3.tar.bz2
diff --git a/xorg-x11-xkb-utils.spec b/xorg-x11-xkb-utils.spec
index dcaa97a..1d9fbf4 100644
--- a/xorg-x11-xkb-utils.spec
+++ b/xorg-x11-xkb-utils.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 xkb utilities
 Name: xorg-x11-xkb-utils
-Version: 7.5
-Release: 6%{?dist}
+Version: 7.7
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -10,10 +10,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # use the macro so the doc dir is changed automagically
 %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.2.3.tar.bz2
-Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.1.tar.bz2
+Source1: ftp://ftp.x.org/pub/individual/app/xkbcomp-1.2.4.tar.bz2
+Source2: ftp://ftp.x.org/pub/individual/app/xkbevd-1.1.3.tar.bz2
 Source3: ftp://ftp.x.org/pub/individual/app/xkbprint-1.0.3.tar.bz2
-Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.2.0.tar.bz2
+Source4: ftp://ftp.x.org/pub/individual/app/setxkbmap-1.3.0.tar.bz2
 
 BuildRequires: pkgconfig
 BuildRequires: byacc
@@ -37,6 +37,13 @@ BuildRequires: libXpm-devel
 Provides: setxkbmap xkbcomp
 Obsoletes: XFree86 xorg-x11
 
+%package devel
+Summary:        X.Org X11 xkb utilities development package.
+Group:          Development/Libraries
+Requires:       pkgconfig
+%description devel
+X.Org X11 xkb utilities development files.
+
 %package -n xorg-x11-xkb-extras
 Summary: X.Org X11 xkb gadgets
 Provides: xkbevd xkbprint xkbutils
@@ -93,7 +100,17 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xkbvleds.*
 %{_mandir}/man1/xkbwatch.*
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/xkbcomp.pc
+
 %changelog
+* Wed Jun 20 2012 Peter Hutterer <peter.hutterer at redhat.com> 7.7-1
+- X11R7.7 updates:
+- xkbcomp 1.2.4
+- setxkbmap 1.3.0
+- xkbevd 1.1.3
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.5-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild