Dr. Werner Fink 2015-07-13 10:55:17 +00:00 committed by Git OBS Bridge
parent 86ae233ae9
commit 4bf0e13640
2 changed files with 13 additions and 8 deletions

View File

@ -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 Wed Apr 8 11:00:43 CEST 2015 - hare@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package multipath-tools # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -23,6 +23,8 @@ BuildRequires: libudev-devel
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: systemd-devel BuildRequires: systemd-devel
BuildRequires: udev BuildRequires: udev
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
Url: http://christophe.varoqui.free.fr/ Url: http://christophe.varoqui.free.fr/
Requires: device-mapper >= 1.2.78 Requires: device-mapper >= 1.2.78
Requires: kpartx Requires: kpartx
@ -37,11 +39,7 @@ Group: System/Base
Source: http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-%{version}.tar.bz2 Source: http://christophe.varoqui.free.fr/multipath-tools/multipath-tools-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Patch0: %{name}-%{version}-sles12.diff.bz2 Patch0: %{name}-%{version}-sles12.diff.bz2
%if %suse_version > 1220 %global _sysdir %(pkg-config --variable=systemdutildir systemd | sed -r 's@/systemd$@@')
%define _sysdir usr/lib
%else
%define _sysdir lib
%endif
%description %description
This package provides the tools to manage multipathed devices by This package provides the tools to manage multipathed devices by
@ -96,12 +94,14 @@ Authors:
%prep %prep
%setup -q -n multipath-tools-%{version} %setup -q -n multipath-tools-%{version}
%patch0 -p1 %patch0 -p1
echo %{_udevrulesdir}
echo %{_sysdir}
%build %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 %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/ mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so rm $RPM_BUILD_ROOT/%_lib/libmpathpersist.so
mkdir -p $RPM_BUILD_ROOT/usr/sbin mkdir -p $RPM_BUILD_ROOT/usr/sbin