commit f1f79628e3f421708cd8bc3a352b524278744f96
Author: Jan Rękorajski <[email protected]>
Date: Sat Feb 28 17:25:56 2015 +0100
- fix linking with systemd libs
- rel 3
systemd-link.patch | 13 +++++++++++++
util-linux.spec | 26 +++++++++++++-------------
2 files changed, 26 insertions(+), 13 deletions(-)
---
diff --git a/util-linux.spec b/util-linux.spec
index 4e240cf..8c741e7 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -37,7 +37,7 @@ Summary(tr.UTF-8): Temel sistem araçları
Summary(uk.UTF-8): Набір базових системних утиліт для Linux
Name: util-linux
Version: 2.26
-Release: 2
+Release: 3
License: GPL v2+
Group: Applications/System
Source0:
https://www.kernel.org/pub/linux/utils/util-linux/v2.26/%{name}-%{version}.tar.xz
@@ -56,13 +56,13 @@ Source10: nologin.c
Source11: nologin.8
Source12: blockdev.service
Source13: blockdev.sh
-
-Patch3: %{name}-fdformat-ide.patch
-Patch4: %{name}-fhs.patch
-Patch7: %{name}-login-lastlog.patch
-Patch8: %{name}-procpartitions.patch
-Patch9: su-paths.patch
-Patch10: %{name}-diet.patch
+Patch0: %{name}-fdformat-ide.patch
+Patch1: %{name}-fhs.patch
+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
@@ -731,13 +731,13 @@ Bashowe dopełnianie parametrów dla poleceń z pakietu
util-linux.
%prep
%setup -q -a1
-
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%{?with_initrd:%patch10 -p1}
+%{?with_initrd:%patch5 -p1}
+%patch6 -p1
cp -p %{SOURCE10} nologin.c
diff --git a/systemd-link.patch b/systemd-link.patch
new file mode 100644
index 0000000..c6d160c
--- /dev/null
+++ b/systemd-link.patch
@@ -0,0 +1,13 @@
+--- 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
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/util-linux.git/commitdiff/f1f79628e3f421708cd8bc3a352b524278744f96
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
