- updated to 2.26.1

- removed obsolete systemd-link patch

diff --git a/systemd-link.patch b/systemd-link.patch
deleted file mode 100644 (file)
index c6d160c..0000000
--- a/systemd-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- util-linux-2.26/misc-utils/Makemodule.am~  2015-02-10 10:49:46.000000000 +0100
-+++ util-linux-2.26/misc-utils/Makemodule.am   2015-02-28 17:22:44.747702370 +0100
-@@ -23,8 +23,8 @@
- dist_man_MANS += misc-utils/logger.1
- logger_SOURCES = misc-utils/logger.c lib/strutils.c
- if HAVE_SYSTEMD
--logger_LDADD = $(SYSTEMD_LIBS) $(SYSTEMD_JOURNAL_LIBS)
--logger_CFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS)
-+logger_LDADD = $(SYSTEMD_LIBS) $(SYSTEMD_JOURNAL_LIBS) $(SYSTEMD_DAEMON_LIBS)
-+logger_CFLAGS = $(SYSTEMD_CFLAGS) $(SYSTEMD_JOURNAL_CFLAGS) $(SYSTEMD_DAEMON_CFLAGS)
- endif
- endif # BUILD_LOGGER
- 

diff --git a/util-linux.spec b/util-linux.spec
index 9ddb7d2ae24cdf41abba94bef60f21ca59cc31aa..9e2d4f908371db7815417367417d965a92820903 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.26
-Release:       4
+Version:       2.26.1
+Release:       1
 License:       GPL v2+
 Group:         Applications/System
 Source0:       https://www.kernel.org/pub/linux/utils/util-linux/v2.26/%{name}-%{version}.tar.xz
-# Source0-md5: 912c550a4e5c47c0ce9abd0733fa9a64
+# Source0-md5: 2308850946766677f3fabe0685e85de8
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: 3c940c7e7fe699eaa2ddb1bffb3de2fe
 Source2:       login.pamd
@@ -62,7 +62,6 @@ Patch2:               %{name}-login-lastlog.patch
 Patch3:                %{name}-procpartitions.patch
 Patch4:                su-paths.patch
 Patch5:                %{name}-diet.patch
-Patch6:                systemd-link.patch
 URL:           https://github.com/karelzak/util-linux
 BuildRequires: audit-libs-devel >= 1.0.6
 BuildRequires: autoconf >= 2.60
@@ -737,7 +736,6 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu util-linux.
 %patch3 -p1
 %patch4 -p1
 %{?with_initrd:%patch5 -p1}
-%patch6 -p1
 
 cp -p %{SOURCE10} nologin.c