[packages/multipath-tools] - updated to 0.8.0 - added systemd patch (fix systemd version detection)

qboosh qboosh at pld-linux.org
Sun Mar 10 14:06:09 CET 2019


commit 872752454644e9b460e18b3a15e33f75d982ffeb
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 10 14:11:52 2019 +0100

    - updated to 0.8.0
    - added systemd patch (fix systemd version detection)

 multipath-tools-systemd.patch | 13 +++++++++++++
 multipath-tools.spec          | 10 ++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/multipath-tools.spec b/multipath-tools.spec
index 08d3914..2fc2937 100644
--- a/multipath-tools.spec
+++ b/multipath-tools.spec
@@ -5,14 +5,14 @@
 Summary:	Tools to manage multipathed devices with the device-mapper
 Summary(pl.UTF-8):	Implementacja wielotrasowego dostępu do zasobów przy użyciu device-mappera
 Name:		multipath-tools
-Version:	0.7.9
-%define	gitref	5c67a8b
+Version:	0.8.0
+%define	gitref	eb688e1
 Release:	1
 License:	GPL v2
 Group:		Base
 # http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=%{gitref};sf=tgz
 Source0:	http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=%{version};sf=tgz;fakeout=/%{name}-%{version}.tar.gz
-# Source0-md5:	c5606ce834a3e5795c7ae8b12eb52db9
+# Source0-md5:	af06190a0d167e8a4d11faa6919d60f9
 Source100:	branch.sh
 Source1:	multipathd.init
 Source2:	multipathd.sysconfig
@@ -22,6 +22,7 @@ Source4:	multipath.conf.defaults
 Patch0:		%{name}-paths.patch
 Patch1:		%{name}-kpartx-udev.patch
 Patch2:		config.patch
+Patch3:		%{name}-systemd.patch
 URL:		http://christophe.varoqui.free.fr/
 BuildRequires:	device-mapper-devel >= 1.02.08
 BuildRequires:	libaio-devel
@@ -29,7 +30,7 @@ BuildRequires:	linux-libc-headers >= 2.6.12.0-5
 BuildRequires:	readline-devel
 BuildRequires:	rpmbuild(macros) >= 1.647
 BuildRequires:	sed >= 4.0
-BuildRequires:	systemd-devel
+BuildRequires:	systemd-devel >= 1:209
 BuildRequires:	udev-devel
 %if %{with initrd}
 BuildRequires:	device-mapper-initrd-devel
@@ -130,6 +131,7 @@ umożliwia tworzenie partycji na odwzorowaniach wielotrasowych.
 %patch1 -p1
 cp -p %{SOURCE4} .
 %patch2 -p1
+%patch3 -p1
 
 %build
 %if %{with initrd}
diff --git a/multipath-tools-systemd.patch b/multipath-tools-systemd.patch
new file mode 100644
index 0000000..f8413f4
--- /dev/null
+++ b/multipath-tools-systemd.patch
@@ -0,0 +1,13 @@
+--- multipath-tools-0.8.0-eb688e1/Makefile.inc.orig	2019-02-14 18:55:29.000000000 +0100
++++ multipath-tools-0.8.0-eb688e1/Makefile.inc	2019-03-10 14:10:20.140218925 +0100
+@@ -36,8 +36,8 @@
+ endif
+ 
+ ifndef SYSTEMD
+-	ifeq ($(shell systemctl --version > /dev/null 2>&1 && echo 1), 1)
+-		SYSTEMD = $(shell systemctl --version 2> /dev/null |  sed -n 's/systemd \([0-9]*\)/\1/p')
++	ifeq ($(shell pkg-config --exists systemd > /dev/null 2>&1 && echo 1), 1)
++		SYSTEMD = $(shell  pkg-config --modversion systemd 2> /dev/null)
+ 	endif
+ endif
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/multipath-tools.git/commitdiff/872752454644e9b460e18b3a15e33f75d982ffeb



More information about the pld-cvs-commit mailing list