[kbd] Update to kbd-1.15.5

vcrhonek vcrhonek at fedoraproject.org
Mon Jan 14 11:17:16 UTC 2013


commit 8ff85b5765059707396b0574c89d5c8103267872
Author: Vitezslav Crhonek <vcrhonek at redhat.com>
Date:   Wed Jan 9 13:54:59 2013 +0100

    Update to kbd-1.15.5

 .gitignore                          |    1 +
 kbd-1.15-defkeymap.patch            |   12 ------------
 kbd-1.15-resizecon-x86_64.patch     |   11 -----------
 kbd-1.15.3-fix-es-translation.patch |   12 ------------
 kbd-1.15.3-loadkeys-d.patch         |   20 --------------------
 kbd.spec                            |   31 ++++++++++++-------------------
 sources                             |    2 +-
 7 files changed, 14 insertions(+), 75 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ca4fa98..42d9493 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ kbd-1.15.tar.gz
 /kbd-1.15.3.tar.bz2.sign
 /kbd-latarcyrheb-32.tar.bz2
 /kbd-1.15.3.tar.gz
+/kbd-1.15.5.tar.gz
diff --git a/kbd.spec b/kbd.spec
index 9f2a959..796d47d 100644
--- a/kbd.spec
+++ b/kbd.spec
@@ -1,6 +1,6 @@
 Name:           kbd
-Version:        1.15.3
-Release:        8%{?dist}
+Version:        1.15.5
+Release:        1%{?dist}
 Summary:        Tools for configuring the console (keyboard, virtual terminals, etc.)
 
 Group:          System Environment/Base
@@ -17,18 +17,10 @@ Patch0:         kbd-1.15-keycodes-man.patch
 Patch1:         kbd-1.15-sparc.patch
 # Patch2: adds default unicode font to unicode_start script
 Patch2:         kbd-1.15-unicode_start.patch
-# Patch3: adds resizecon binary also to the x86_64 arch
-Patch3:         kbd-1.15-resizecon-x86_64.patch
-# Patch4: default keymap in Fedora uses a little bit different name...
-Patch4:         kbd-1.15-defkeymap.patch
-# Patch5: fix of tranlation file broken after new tarball release
-Patch5:         kbd-1.15.3-fix-es-translation.patch
-# Patch6: add missing dumpkeys option to man page
-Patch6:         kbd-1.15.3-dumpkeys-man.patch
-# Patch7: already accepted by upstream
-Patch7:         kbd-1.15.3-loadkeys-d.patch 
-
-BuildRequires:  bison, flex, gettext
+# Patch3: add missing dumpkeys option to man page
+Patch3:         kbd-1.15.3-dumpkeys-man.patch
+
+BuildRequires:  bison, flex, gettext, pam-devel
 Requires:       initscripts >= 5.86-1
 Requires:       %{name}-misc = %{version}-%{release}
 
@@ -50,11 +42,7 @@ keymaps etc. Please note that %{name}-misc is not helpful without kbd.
 %patch0 -p1 -b .keycodes-man
 %patch1 -p1 -b .sparc
 %patch2 -p1 -b .unicode_start
-%patch3 -p1 -b .resizecon_x86_64
-%patch4 -p1 -b .defkeymap
-%patch5 -p1 -b .fix-es-fixtranslation
-%patch6 -p1 -b .dumpkeys-man
-%patch7 -p1 -b .loadkeys-d
+%patch3 -p1 -b .dumpkeys-man
 
 # 7-bit maps are obsolete; so are non-euro maps
 pushd data/keymaps/i386
@@ -131,6 +119,11 @@ rm -rf $RPM_BUILD_ROOT/lib/kbd/locale
 /lib/kbd
 
 %changelog
+* Wed Jan 09 2013 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15.5-1
+- Update to kbd-1.15.5 (removed kbd-1.15-resizecon-x86_64.patch,
+  kbd-1.15-defkeymap.patch, kbd-1.15.3-fix-es-translation.patch,
+  kbd-1.15.3-loadkeys-d.patch)
+
 * Thu Sep 13 2012 Vitezslav Crhonek <vcrhonek at redhat.com> - 1.15.3-8
 - Fix link to upstream tarball
 
diff --git a/sources b/sources
index 25c9153..6f9566b 100644
--- a/sources
+++ b/sources
@@ -2,4 +2,4 @@
 884fdbb0b952b2e3e8389a0c40a3e301  kbd-latarcyrheb-16-fixed.tar.bz2
 dd16ff8c6fa9d81490df28cbd68882eb  fr-dvorak.tar.bz2
 fe118f07a83134b15610503e5e3fe10e  kbd-latarcyrheb-32.tar.bz2
-8143e179a0f3c25646ce5085e8777200  kbd-1.15.3.tar.gz
+34c71feead8ab9c01ec638acea8cd877  kbd-1.15.5.tar.gz


More information about the scm-commits mailing list