Hello community, here is the log from the commit of package multipath-tools for openSUSE:Factory checked in at 2015-08-21 07:34:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/multipath-tools (Old) and /work/SRC/openSUSE:Factory/.multipath-tools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multipath-tools" Changes: -------- --- /work/SRC/openSUSE:Factory/multipath-tools/multipath-tools.changes 2015-05-11 20:25:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.multipath-tools.new/multipath-tools.changes 2015-08-21 07:34:33.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jul 13 10:54:56 UTC 2015 - [email protected] + +- Make it build + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ multipath-tools.spec ++++++ --- /var/tmp/diff_new_pack.irwI0I/_old 2015-08-21 07:34:34.000000000 +0200 +++ /var/tmp/diff_new_pack.irwI0I/_new 2015-08-21 07:34:34.000000000 +0200 @@ -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: 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 @@ 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 @@ %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
