[kbd] Update to kbd-2.0.

vcrhonek vcrhonek at fedoraproject.org
Tue Jul 8 10:09:12 UTC 2014


commit 5f3f815172ff31e3a44a0947006661c4f6d23751
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Tue Jul 8 12:09:17 2014 +0200

    Update to kbd-2.0.

 .gitignore |    1 +
 kbd.spec   |   20 +++++++++-----------
 sources    |    2 +-
 3 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 83247a0..44ec901 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ kbd-1.15.tar.gz
 /kbd-1.15.5.tar.gz
 /kbd-2.0.1.tar.gz
 /kbdinfo.1
+/kbd-2.0.2.tar.xz
diff --git a/kbd.spec b/kbd.spec
index 6dbc1c1..7adaab2 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,12 +1,12 @@
 Name:           kbd
-Version:        2.0.1
-Release:        7%{?dist}
+Version:        2.0.2
+Release:        1%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
 License:        GPLv2+
 URL:            http://www.kbd-project.org/
-Source0:        ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.gz
+Source0:        ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-%{version}.tar.xz
 Source1:        kbd-latsun-fonts.tar.bz2
 Source2:        kbd-latarcyrheb-32.tar.bz2
 Source3:        xml2lst.pl
@@ -22,10 +22,8 @@ Patch2:         kbd-1.15-unicode_start.patch
 Patch3:         kbd-1.15.3-dumpkeys-man.patch
 # Patch4: fixes decimal separator in Swiss German keyboard layout, bz 882529
 Patch4:         kbd-1.15.5-sg-decimal-separator.patch
-# Patch5: implement PAM account and password management, backported from upstream
-Patch5:         kbd-1.15.5-vlock-more-pam.patch
-# Patch6: adds xkb and legacy keymaps subdirs to loadkyes search path, bz 1028207 
-Patch6:         kbd-1.15.5-loadkeys-search-path.patch
+# Patch5: adds xkb and legacy keymaps subdirs to loadkyes search path, bz 1028207 
+Patch5:         kbd-1.15.5-loadkeys-search-path.patch
 
 BuildRequires:  bison, flex, gettext, pam-devel, check-devel
 BuildRequires:  console-setup, xkeyboard-config
@@ -66,13 +64,10 @@ cp -fp %{SOURCE3} .
 %patch2 -p1 -b .unicode_start
 %patch3 -p1 -b .dumpkeys-man
 %patch4 -p1 -b .sg-decimal-separator
-%patch5 -p1 -b .vlock-more-pam
-%patch6 -p1 -b .loadkeys-search-path
+%patch5 -p1 -b .loadkeys-search-path
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
-mv qwerty/fi.map qwerty/fi-old.map
-cp qwerty/fi-latin9.map qwerty/fi.map
 cp qwerty/pt-latin9.map qwerty/pt.map
 cp qwerty/sv-latin1.map qwerty/se-latin1.map
 
@@ -180,6 +175,9 @@ zgrep -L "U+0041" $RPM_BUILD_ROOT/lib/kbd/keymaps/xkb/* | xargs rm -f
 /lib/kbd/keymaps/legacy
 
 %changelog
+* Tue Jul 08 2014 Vitezslav Crhonek <vcrhonek at redhat.com> - 2.0.2-1
+- Update to kbd-2.0.2
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index e305e48..41d6f0d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 050e1e454e9c01e22f198303d649efb8  kbd-latsun-fonts.tar.bz2
 fe118f07a83134b15610503e5e3fe10e  kbd-latarcyrheb-32.tar.bz2
-cc0ee9f2537d8636cae85a8c6541ed2e  kbd-2.0.1.tar.gz
 37ac9b90d43d3581592df8c74ab6b2d5  kbdinfo.1
+87475eb78b1d6e6ab06686dd323ad4ba  kbd-2.0.2.tar.xz


More information about the scm-commits mailing list