From 4bf0e1364080809bf6ed37a8a5d0ac690c4356ddf448c9472fb3922ea7663950 Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 13 Jul 2015 10:55:17 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=91 --- multipath-tools.changes | 5 +++++ multipath-tools.spec | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/multipath-tools.changes b/multipath-tools.changes index 96a0cc9..62b0a32 100644 --- a/multipath-tools.changes +++ b/multipath-tools.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jul 13 10:54:56 UTC 2015 - werner@suse.de + +- Make it build + ------------------------------------------------------------------- Wed Apr 8 11:00:43 CEST 2015 - hare@suse.de diff --git a/multipath-tools.spec b/multipath-tools.spec index 9558b22..42ae99a 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ # # spec file for package multipath-tools # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -23,6 +23,8 @@ BuildRequires: libudev-devel BuildRequires: readline-devel BuildRequires: systemd-devel BuildRequires: udev +BuildRequires: pkgconfig(systemd) +BuildRequires: pkgconfig(udev) Url: http://christophe.varoqui.free.fr/ Requires: device-mapper >= 1.2.78 Requires: kpartx @@ -37,11 +39,7 @@ Group: System/Base Source: http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-build Patch0: %{name}-%{version}-sles12.diff.bz2 -%if %suse_version > 1220 -%define _sysdir usr/lib -%else -%define _sysdir lib -%endif +%global _sysdir %(pkg-config --variable=systemdutildir systemd | sed -r 's@/systemd$@@') %description This package provides the tools to manage multipathed devices by @@ -96,12 +94,14 @@ Authors: %prep %setup -q -n multipath-tools-%{version} %patch0 -p1 +echo %{_udevrulesdir} +echo %{_sysdir} %build -make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} +make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} SYSTEMD=yes %install -make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} install +make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} install SYSTEMD=yes mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/ rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so mkdir -p $RPM_BUILD_ROOT/usr/sbin