From 246b9762e2c6a560fcb6ab0e2c3b387bc6db78e4 Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Tue, 18 Jan 2022 09:42:24 +0100
Subject: [PATCH] Use default Finnish xkb-converted layout

Resolves: #203112
---
 kbd.spec | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/kbd.spec b/kbd.spec
index e10a4ab..65a562c 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -5,7 +5,7 @@
 
 Name:           kbd
 Version:        2.4.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 License:        GPLv2+
 URL:            http://www.kbd-project.org/
@@ -164,13 +164,6 @@ done < layouts-list-uniq.lst
 # wipe converted layouts which cannot input ASCII (#1031848)
 zgrep -L "U+0041" $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/* | xargs rm -f
 
-# Rename the converted default fi (kotoistus) layout (#1117891), if exists
-if [ -f "$RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map.gz" ]; then
-  gunzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map.gz
-  mv $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi.map $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi-kotoistus.map
-  gzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/fi-kotoistus.map
-fi
-
 # Fix converted cz layout - add compose rules, if exists
 if [ -f "$RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map.gz" ]; then
   gunzip $RPM_BUILD_ROOT%{kbd_datadir}/keymaps/xkb/cz.map.gz
@@ -203,6 +196,10 @@ make check
 %{kbd_datadir}/keymaps/legacy
 
 %changelog
+* Tue Jan 18 2022 Vitezslav Crhonek <vcrhonek@redhat.com> - 2.4.0-8
+- Use default Finnish xkb-converted layout
+  Resolves: #2031127
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.4.0-7
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688