- updated to 2.32

- updated pl.po patch

diff --git a/util-linux-diet.patch b/util-linux-diet.patch
index 24404a5f53dd54488bd9985dbbf321b4e1620caa..4c3896b6cef05592aae8fab667066aff9e87f927 100644 (file)
--- a/util-linux-diet.patch
+++ b/util-linux-diet.patch
@@ -34,32 +34,6 @@
  
  static int do_scale_by_power (uintmax_t *x, int base, int power)
  {
-#--- util-linux-2.19/libmount/src/utils.c~     2011-01-24 23:46:29.000000000 +0100
-#+++ util-linux-2.19/libmount/src/utils.c      2011-02-10 20:12:00.499611392 +0100
-#@@ -398,7 +398,11 @@
-#      int rc = -1;
-#         struct passwd pwd;
-#      struct passwd *pw;
-#+#ifdef _SC_GETPW_R_SIZE_MAX
-#      size_t sz = sysconf(_SC_GETPW_R_SIZE_MAX);
-#+#else
-#+     size_t sz = 0;
-#+#endif
-#      char *buf;
-# 
-#      if (!username || !uid)
-#@@ -427,7 +431,11 @@
-#      int rc = -1;
-#         struct group grp;
-#      struct group *gr;
-#+#ifdef _SC_GETGR_R_SIZE_MAX
-#      size_t sz = sysconf(_SC_GETGR_R_SIZE_MAX);
-#+#else
-#+     size_t sz = 0;
-#+#endif
-#      char *buf;
-# 
-#      if (!groupname || !gid)
 --- util-linux-2.19/lib/at.c~  2011-01-31 16:43:47.000000000 +0100
 +++ util-linux-2.19/lib/at.c   2011-02-10 20:30:37.336797058 +0100
 @@ -7,6 +7,7 @@

diff --git a/util-linux-pl.po.patch b/util-linux-pl.po.patch
index 3db2f1c649e0b7f5df79ad5a8ded7e7949c4615c..dc9726edbd1d68f4bc97d57fa1359dafc7684dcc 100644 (file)
--- a/util-linux-pl.po.patch
+++ b/util-linux-pl.po.patch
@@ -1,11 +1,14 @@
---- util-linux-2.31/po/pl.po.orig      2017-10-19 13:10:45.291478665 +0200
-+++ util-linux-2.31/po/pl.po   2017-11-21 17:21:29.525515998 +0100
-@@ -4272,7 +4272,7 @@
- "Type 'help' to get more information.\n"
- msgstr ""
- "\n"
--"`%s --help' wyświetli więcej informacji.\n"
-+"Polecenie 'help' wyświetli więcej informacji.\n"
+--- util-linux-2.32/po/pl.po.orig      2018-03-21 15:27:35.315730563 +0100
++++ util-linux-2.32/po/pl.po   2018-04-01 23:39:21.382508628 +0200
+@@ -10563,9 +10563,9 @@
+ msgstr "nie udało się przeanalizować --timeout"
  
- #: disk-utils/sfdisk.c:1669
- msgid "All partitions used."
+ #: misc-utils/uuidd.c:640
+-#, fuzzy, c-format
++#, c-format
+ msgid "socket name too long: %s"
+-msgstr "nazwa woluminu za długa"
++msgstr "nazwa gniazda za długa: %s"
+ 
+ #: misc-utils/uuidd.c:647
+ msgid "Both --socket-activation and --socket specified. Ignoring --socket."

diff --git a/util-linux.spec b/util-linux.spec
index b2e3404f830d11db8d3a673554361cff1b262d3e..b53a00da5c448906815dab72dc267eb43a11391d 100644 (file)
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -36,13 +36,13 @@ Summary(ru.UTF-8):  Набор базовых системных утилит д
 Summary(tr.UTF-8):     Temel sistem araçları
 Summary(uk.UTF-8):     Набір базових системних утиліт для Linux
 Name:          util-linux
-Version:       2.31
-Release:       2
+Version:       2.32
+Release:       1
 License:       GPL v2+
 Group:         Applications/System
 # https://github.com/karelzak/util-linux (GitHub backup)
 Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 5b6821c403c3cc6e7775f74df1882a20
+# Source0-md5: e0d8a25853f88cd15ff557e5d8cb4ea7
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:       login.pamd
@@ -1141,7 +1141,6 @@ fi
 %attr(755,root,root) %{_bindir}/rename
 %attr(755,root,root) %{_bindir}/renice
 %attr(755,root,root) %{_bindir}/rev
-%attr(755,root,root) %{_bindir}/rfkill
 %attr(755,root,root) %{_bindir}/script
 %attr(755,root,root) %{_bindir}/scriptreplay
 %attr(755,root,root) %{_bindir}/setpriv
@@ -1160,6 +1159,7 @@ fi
 %attr(755,root,root) %{_sbindir}/ldattach
 %attr(755,root,root) %{_sbindir}/readprofile
 %attr(755,root,root) %{_sbindir}/resizepart
+%attr(755,root,root) %{_sbindir}/rfkill
 %attr(755,root,root) %{_sbindir}/rtcwake
 
 %{systemdunitdir}/fstrim.service