- xkeyboard-config 1.7

.cvsignore

@@ -1 +1 @@
-xkeyboard-config-1.6.tar.bz2
+xkeyboard-config-1.7.tar.bz2

sources

@@ -1 +1 @@
-5ae575a9073af12cd71773e065b38b3a  xkeyboard-config-1.6.tar.bz2
+d351c0109fac166edcedad32d1b0e38e  xkeyboard-config-1.7.tar.bz2

xkeyboard-config.spec

@@ -3,8 +3,8 @@
 
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
-Version: 1.6
+Version: 1.7
-Release: 3%{?dist}
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -12,10 +12,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 
-# Both upstream
-Patch1: xkeyboard-config-1.6-caps-super.patch
-Patch2: xkeyboard-config-1.6-caps-hyper.patch
-
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -56,7 +52,7 @@ fi
 git add .
 git commit -a -q -m "%{version} baseline."
 
-git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
+#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
 
 %build
 %configure \
@@ -96,6 +92,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Jan 06 2010 Peter Hutterer <peter.hutterer@redhat.com> 1.7-1
+- xkeyboard-config 1.7
+
 * Tue Aug 18 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.6-3
 - xkeyboard-config-1.6-caps-super.patch: add caps:super option (#505187)
 - xkeyboard-config-1.6-caps-hyper.patch: add caps:hyper option (#505187)