From c082c1359549db42f683a6ad8407357c5798051a Mon Sep 17 00:00:00 2001
From: Vitezslav Crhonek <vcrhonek@redhat.com>
Date: Aug 27 2018 08:54:05 +0000
Subject: Update to latest upstream version


---

diff --git a/.gitignore b/.gitignore
index b43fd2b..8c74f90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/console-setup_1.184.tar.xz
+/console-setup_1.185.tar.xz
diff --git a/console-setup-1.84-ctrll-lock.patch b/console-setup-1.84-ctrll-lock.patch
index 147e2a5..09fe49e 100644
--- a/console-setup-1.84-ctrll-lock.patch
+++ b/console-setup-1.84-ctrll-lock.patch
@@ -1,6 +1,6 @@
-diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
---- console-setup/Keyboard/ckbcomp.orig	2018-06-21 10:58:36.262160943 +0200
-+++ console-setup/Keyboard/ckbcomp	2018-06-27 13:04:01.843639711 +0200
+diff -up console-setup-1.185/Keyboard/ckbcomp.orig console-setup-1.185/Keyboard/ckbcomp
+--- console-setup-1.185/Keyboard/ckbcomp.orig	2018-08-27 10:45:20.753504386 +0200
++++ console-setup-1.185/Keyboard/ckbcomp	2018-08-27 10:45:20.758504393 +0200
 @@ -196,10 +196,6 @@ my %acmtable; # Unicode -> legacy code (
  
  my $KEYMAP = ''; # This variable contains the generated keymap
@@ -12,7 +12,7 @@ diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
  my %keycodes_table; # x keysym -> x key code
  my %aliases;        # x keysym -> x keysym
  
-@@ -4376,9 +4372,6 @@ sub print_vector {
+@@ -4378,9 +4374,6 @@ sub print_vector {
  		my $u = ord (uc (pack ("U", $v)));
  		my $c = ($v == $l ? $u : $l);
  		$capsvector[$mask] = $1 ."U+". sprintf ("%04x", $c);
@@ -22,7 +22,7 @@ diff -up console-setup/Keyboard/ckbcomp.orig console-setup/Keyboard/ckbcomp
  	    }
  	}
  	if ($no_NoSymbol) {
-@@ -4776,10 +4769,6 @@ keycode 127 =
+@@ -4778,10 +4771,6 @@ keycode 127 =
      die "$0: Unsupported keyboard type $arch\n";
  }
  
diff --git a/console-setup.spec b/console-setup.spec
index aa2bd2a..3abdf03 100644
--- a/console-setup.spec
+++ b/console-setup.spec
@@ -1,7 +1,7 @@
 
 Name:		console-setup
-Version:	1.184
-Release:	3%{?dist}
+Version:	1.185
+Release:	1%{?dist}
 Summary:	Tools for configuring the console using X Window System key maps
 
 # For a breakdown of the licensing, see COPYRIGHT, copyright, copyright.fonts and copyright.xkb
@@ -32,7 +32,7 @@ supports several languages that would be otherwise unsupported on the console
 
 
 %prep
-%setup -q -n %{name}
+%setup -q -n %{name}-%{version}
 %patch0 -p1 -b .paths
 %patch1 -p1 -b .fsf-address
 %patch2 -p1 -b .ctrll-lock
@@ -63,6 +63,10 @@ rm -rf $RPM_BUILD_ROOT/etc/console-setup
 
 
 %changelog
+* Mon Aug 27 2018 Vitezslav Crhonek <vcrhonek@redhat.com> - 1.185-1
+- Update to latest upstream version
+  Resolves: #1616114
+
 * Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.184-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
diff --git a/sources b/sources
index 1b14655..bd9067b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (console-setup_1.184.tar.xz) = 3e970497d32ea7c04e7c41377b92378f3449deabc067d988c2f68d3d4d5e436726f2bd6bad0862518447e043a43a084288369d088e121d10fff14c780ecab4ba
+SHA512 (console-setup_1.185.tar.xz) = 413b7206d96913cd845dd0f3b2f78f631ef187fd56d3615a96de91189515f6eb9229bf3dadd5be44ef35a5b3ecd4be28cfe573459f3d411c201b506d77c62251