This time with the sources

from extras, even if previously configured (#1401327)

.gitignore

@@ -25,3 +25,4 @@ xkeyboard-config-1.9.tar.bz2
 /xkeyboard-config-2.17.tar.bz2
 /xkeyboard-config-2.18.tar.bz2
 /xkeyboard-config-2.19.tar.bz2
+/xkeyboard-config-2.20.tar.bz2

0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch

@@ -0,0 +1,48 @@
+From af984bd5ac9041090ead4d3461c081d045d8608b Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon, 5 Dec 2016 10:33:04 +1000
+Subject: [PATCH] Revert "rules: Move Finnish DAS layout to extras"
+
+This reverts commit d4d906d28b135a30b3761c263f0e9aff5da809d5.
+---
+ rules/base.extras.xml.in | 6 ------
+ rules/base.xml.in        | 6 ++++++
+ 2 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/rules/base.extras.xml.in b/rules/base.extras.xml.in
+index f95f44d..4fd7d20 100644
+--- a/rules/base.extras.xml.in
++++ b/rules/base.extras.xml.in
+@@ -660,12 +660,6 @@
+       <variantList>
+         <variant>
+           <configItem>
+-            <name>das</name>
+-            <_description>Finnish (DAS)</_description>
+-          </configItem>
+-        </variant>
+-        <variant>
+-          <configItem>
+             <name>sun_type6</name>
+             <_description>Finnish (Sun Type 6/7)</_description>
+           </configItem>
+diff --git a/rules/base.xml.in b/rules/base.xml.in
+index ffa70eb..d1c1393 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -2720,6 +2720,12 @@
+             <_description>Finnish (Macintosh)</_description>
+           </configItem>
+         </variant>
++        <variant>
++          <configItem>
++            <name>das</name>
++            <_description>Finnish (DAS)</_description>
++          </configItem>
++        </variant>
+       </variantList>
+     </layout>
+     <layout>
+-- 
+2.9.3
+

sources

@@ -1 +1 @@
-88cbf55f2f32b80ba9bb872889daf7ff  xkeyboard-config-2.19.tar.bz2
+SHA512 (xkeyboard-config-2.20.tar.bz2) = 29584096874cf8f1444ed00374150fb186e9a74221b384d779bcf01c0762977f8a6a1b3dfa37acd560667a79cc80d4c0d39729b7dc21809520a7254026439db4

xkeyboard-config.spec

@@ -6,11 +6,13 @@
 
 Summary:    X Keyboard Extension configuration data
 Name:       xkeyboard-config
-Version:    2.19
-Release:    1%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
+Version:    2.20
+Release:    2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist}
 License:    MIT
 URL:        http://www.freedesktop.org/wiki/Software/XKeyboardConfig
 
+Patch01:    0001-Revert-rules-Move-Finnish-DAS-layout-to-extras.patch
+
 %if 0%{?gitdate}
 Source0:    %{name}-%{gitdate}.tar.bz2
 Source1:    make-git-snapshot.sh
@@ -107,6 +109,16 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Wed Feb 08 2017 Peter Hutterer <peter.hutterer@redhat.com> 2.20-2
+- This time with the sources
+
+* Wed Feb 08 2017 Peter Hutterer <peter.hutterer@redhat.com> 2.20-1
+- xkeyboard-config 2.20
+
+* Mon Dec 05 2016 Peter Hutterer <peter.hutterer@redhat.com> 2.19-1.1
+- Revert move of fi(das) from base to extras. GNOME doesn't apply layouts
+  from extras, even if previously configured (#1401327)
+
 * Tue Oct 11 2016 Peter Hutterer <peter.hutterer@redhat.com> 2.19-1
 - xkeyboard-config 2.19