From 411d041162dd5f3d56da6c06e4474138430c3dae Mon Sep 17 00:00:00 2001
From: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed, 27 Jan 2016 13:15:27 +1000
Subject: [PATCH] xkeyboard-config 2.17

---
 .gitignore                                    |  1 +
 ...e-br-thinkpad-model-to-the-xml-files.patch | 45 -------------------
 sources                                       |  2 +-
 xkeyboard-config.spec                         |  9 ++--
 4 files changed, 7 insertions(+), 50 deletions(-)
 delete mode 100644 0001-Add-the-br-thinkpad-model-to-the-xml-files.patch

diff --git a/.gitignore b/.gitignore
index 52148a6..1142a94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,4 @@ xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-2.14.tar.bz2
 /xkeyboard-config-2.15.tar.bz2
 /xkeyboard-config-2.16.tar.bz2
+/xkeyboard-config-2.17.tar.bz2
diff --git a/0001-Add-the-br-thinkpad-model-to-the-xml-files.patch b/0001-Add-the-br-thinkpad-model-to-the-xml-files.patch
deleted file mode 100644
index 3e685e6..0000000
--- a/0001-Add-the-br-thinkpad-model-to-the-xml-files.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6ae3f980f479044c9dd2846054ffb94b08100ec4 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Tue, 22 Dec 2015 12:18:32 +1000
-Subject: [PATCH] Add the br(thinkpad) model to the xml files
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1292881
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- rules/base.xml.in | 6 ++++++
- symbols/br        | 1 +
- 2 files changed, 7 insertions(+)
-
-diff --git a/rules/base.xml.in b/rules/base.xml.in
-index bae2b56..daf8322 100644
---- a/rules/base.xml.in
-+++ b/rules/base.xml.in
-@@ -2279,6 +2279,12 @@
-             </languageList>
-           </configItem>
-         </variant>
-+        <variant>
-+          <configItem>
-+            <name>thinkpad</name>
-+            <_description>Portuguese (Brazil, IBM/Lenovo ThinkPad)</_description>
-+          </configItem>
-+        </variant>
-       </variantList>
-     </layout>
-     <layout>
-diff --git a/symbols/br b/symbols/br
-index f65d13a..b7a76d5 100644
---- a/symbols/br
-+++ b/symbols/br
-@@ -64,6 +64,7 @@ partial alphanumeric_keys
- xkb_symbols "thinkpad" {
- 
-     include "br(abnt2)"
-+    name[Group1]="Portuguese (Brazil, IBM/Lenovo ThinkPad)";
- 
-     key <RCTL> { [        slash,       question,        degree,    questiondown ] };
- };
--- 
-2.5.0
-
diff --git a/sources b/sources
index d74dfab..26f59f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bf6aa31195584cfce01b2194c3e5ea26  xkeyboard-config-2.16.tar.bz2
+15034bb74deebde54161dface62abbce  xkeyboard-config-2.17.tar.bz2
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 38837ea..d7809e1 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -6,8 +6,8 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.16
-Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:    2.17
+Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
@@ -19,8 +19,6 @@ Source2:    commitid
 Source0:    http://xorg.freedesktop.org/archive/individual/data/%{name}/%{name}-%{version}.tar.bz2
 %endif
 
-Patch01:    0001-Add-the-br-thinkpad-model-to-the-xml-files.patch
-
 BuildArch:  noarch
 
 BuildRequires:  gettext
@@ -109,6 +107,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Jan 27 2016 Peter Hutterer <peter.hutterer@redhat.com> 2.17-1
+- xkeyboard-config 2.17
+
 * Wed Jan 20 2016 Peter Hutterer <peter.hutterer@redhat.com>
 - s/define/global/