- updated to 2.24.2

- removed obsolete hotkeys patch (vipw uses rpmatch since ~2012)

diff --git a/util-linux-hotkeys.patch b/util-linux-hotkeys.patch
deleted file mode 100644 (file)
index 7a262f0..0000000
--- a/util-linux-hotkeys.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-- vipw asks for editing shadow in local language but only "Y" is accepted as yes
-
---- util-linux-2.12j/po/ca.po.sopwith  2004-12-05 14:08:08.000000000 -0500
-+++ util-linux-2.12j/po/ca.po  2004-12-10 13:10:52.411668785 -0500
-@@ -7183,7 +7183,7 @@
- #: login-utils/vipw.c:354
- #, c-format
- msgid "Would you like to edit %s now [y/n]? "
--msgstr "Desitgeu editar %s ara? [s/n] "
-+msgstr "Desitgeu editar %s ara? [y/n] "
- 
- #: login-utils/wall.c:104
- #, c-format
---- util-linux-ng-2.17.2/po/de.po.orig 2010-05-09 12:46:21.882940098 +0200
-+++ util-linux-ng-2.17.2/po/de.po      2010-05-09 12:46:26.774938422 +0200
-@@ -7945,7 +7945,7 @@
- #: login-utils/vipw.c:352
- #, c-format
- msgid "Would you like to edit %s now [y/n]? "
--msgstr "Würden Sie jetzt gerne %s bearbeiten [j/n]? "
-+msgstr "Würden Sie jetzt gerne %s bearbeiten [y/n]? "
- 
- #: login-utils/wall.c:112
- #, c-format
---- util-linux-ng-2.17.2/po/hu.po.orig 2010-05-09 12:47:26.586942613 +0200
-+++ util-linux-ng-2.17.2/po/hu.po      2010-05-09 12:47:30.750935908 +0200
-@@ -7794,7 +7794,7 @@
- #: login-utils/vipw.c:352
- #, c-format
- msgid "Would you like to edit %s now [y/n]? "
--msgstr "Kívánja szerkeszteni a következőt: %s [i/n]? "
-+msgstr "Kívánja szerkeszteni a következőt: %s [y/n]? "
- 
- #: login-utils/wall.c:112
- #, c-format
-; FIXME FIXME
-;--- util-linux-2.12j/po/pt_BR.po.sopwith      2004-12-05 14:08:15.000000000 -0500
-;+++ util-linux-2.12j/po/pt_BR.po      2004-12-10 13:11:47.560587674 -0500
-;@@ -7161,7 +7161,7 @@
-; #: login-utils/vipw.c:357
-; #, c-format
-; msgid "Would you like to edit %s now [y/n]? "
-;-msgstr "Você gostaria de editar %s agora [s/n]? "
-;+msgstr "Você gostaria de editar %s agora [y/n]? "
-; 
-; #: misc-utils/cal.c:372
-; msgid "illegal day value"
---- util-linux-ng-2.17.2/po/ru.po.orig 2010-05-09 12:51:15.306941775 +0200
-+++ util-linux-ng-2.17.2/po/ru.po      2010-05-09 12:51:21.562935070 +0200
-@@ -7799,7 +7799,7 @@
- #: login-utils/vipw.c:352
- #, c-format
- msgid "Would you like to edit %s now [y/n]? "
--msgstr "èÏÔÉÔÅ ÌÉ ×Ù ÓÅÊÞÁÓ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ %s [Ä/Î]? "
-+msgstr "èÏÔÉÔÅ ÌÉ ×Ù ÓÅÊÞÁÓ ÏÔÒÅÄÁËÔÉÒÏ×ÁÔØ %s [y/n]? "
- 
- #: login-utils/wall.c:112
- #, c-format
---- util-linux-ng-2.17.2/po/tr.po.orig 2010-05-09 12:52:29.066940098 +0200
-+++ util-linux-ng-2.17.2/po/tr.po      2010-05-09 12:52:33.602936746 +0200
-@@ -7771,7 +7771,7 @@
- #: login-utils/vipw.c:352
- #, c-format
- msgid "Would you like to edit %s now [y/n]? "
--msgstr "%s dosyasını şimdi düzenlemek ister misiniz [e/h]? "
-+msgstr "%s dosyasını şimdi düzenlemek ister misiniz [y/n]? "
- 
- #: login-utils/wall.c:112
- #, c-format

diff --git a/util-linux.spec b/util-linux.spec
index 342188fe533eeffc5883e0bdf66eb043119b5603..a9665d89a928d49832f19d281e8647301bc5acc9 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -36,12 +36,12 @@ Summary(ru.UTF-8):  Набор базовых системных утилит д
 Summary(tr.UTF-8):     Temel sistem araçları
 Summary(uk.UTF-8):     Набір базових системних утиліт для Linux
 Name:          util-linux
-Version:       2.24.1
+Version:       2.24.2
 Release:       1
 License:       GPL
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v2.24/%{name}-%{version}.tar.xz
-# Source0-md5: 88d46ae23ca599ac5af9cf96b531590f
+# Source0-md5: 3f191727a0d28f7204b755cf1b6ea0aa
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:       login.pamd
@@ -61,7 +61,6 @@ Patch1:               %{name}-ng-union-mount.patch
 
 Patch3:                %{name}-fdformat-ide.patch
 Patch4:                %{name}-fhs.patch
-Patch5:                %{name}-hotkeys.patch
 Patch7:                %{name}-login-lastlog.patch
 Patch8:                %{name}-procpartitions.patch
 Patch9:                su-paths.patch
@@ -671,7 +670,6 @@ Wiązania Pythona 3.x do biblioteki libmount.
 
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1