Accepting request 482451 from home:mwilck:branches:Base:System

Added bugzilla references to satisfy "leaper" BS review bot for SLES.

OBS-URL: https://build.opensuse.org/request/show/482451
OBS-URL: https://build.opensuse.org/package/show/Base:System/multipath-tools?expand=0&rev=118
This commit is contained in:
Martin Wilck 2017-03-24 15:23:05 +00:00 committed by Git OBS Bridge
parent a3fafa8212
commit a1bf7de56b
3 changed files with 36 additions and 29 deletions

View File

@ -1,5 +1,5 @@
<services>
<service name="tar_scm" mode="localonly">
<service name="tar_scm" mode="disabled">
<param name="scm">git</param>
<param name="url">https://github.com/openSUSE/multipath-tools.git</param>
<param name="subdir"></param>
@ -8,9 +8,9 @@
<param name="revision">bcb5d0f4</param>
<param name="changesgenerate">enable</param>
</service>
<service name="recompress" mode="localonly">
<service name="recompress" mode="disabled">
<param name="file">*multipath-tools*.tar</param>
<param name="compression">xz</param>
</service>
<service name="set_version" mode="localonly"/>
<service name="set_version" mode="disabled"/>
</services>

View File

@ -1,11 +1,18 @@
-------------------------------------------------------------------
Fri Mar 24 09:59:17 UTC 2017 - mwilck@suse.com
- spec file changes suggested by factory review team (bsc#1030699)
* RPM group adjustments.
* Avoid %__ macro indirections
-------------------------------------------------------------------
Thu Mar 23 13:23:01 UTC 2017 - mwilck@suse.com
- Enable rados for SLES only for x86_64 and aarch64 (ceph is currently
disabled on SLES on s390x and ppc64le) (bsc#1030699)
- Downgrade to version 0.6.4+103+suse.bcb5d0f4:
* temporarily remove commit "multipathd: fix SIGUSR2 handling"
until it's merged in official repo
- Enable rados for SLES only for x86_64 and aarch64 (ceph is currently
disabled on SLES on s390x and ppc64le)
until it's merged in official repo (bsc#1030699)
-------------------------------------------------------------------
Tue Mar 21 11:49:06 UTC 2017 - mwilck@suse.com

View File

@ -76,7 +76,20 @@
%define _libdmmp_version 0.1.0
%define libdmmp_version %(echo %{_libdmmp_version} | tr . _)
# path prefix for systemd unit files and udev rules
%define _sysdir usr/lib
Name: multipath-tools
Url: http://christophe.varoqui.free.fr/
Version: 0.6.4+103+suse.bcb5d0f4
Release: 0
Summary: Tools to Manage Multipathed Devices with the device-mapper
License: GPL-2.0
Group: System/Base
Source: multipath-tools-%{version}.tar.xz
Source1: multipath.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
BuildRequires: device-mapper-devel
BuildRequires: libaio-devel
%if 0%{?with_rados} == 1
@ -91,23 +104,10 @@ BuildRequires: readline-devel
BuildRequires: udev
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(systemd)
Url: http://christophe.varoqui.free.fr/
Requires: device-mapper >= 1.2.78
Requires: kpartx
Requires: sg3_utils
PreReq: coreutils grep
Version: 0.6.4+103+suse.bcb5d0f4
Release: 0
Summary: Tools to Manage Multipathed Devices with the device-mapper
License: GPL-2.0
Group: System/Base
%{?systemd_requires}
%define has_systemd 1
Source: multipath-tools-%{version}.tar.xz
Source1: multipath.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _sysdir usr/lib
%description
This package provides the tools to manage multipathed devices by
@ -135,7 +135,7 @@ makes multipath maps partionable.
%package devel
Summary: Development libraries for multipath-tools
Group: Development/Libraries/Other
Group: Development/Libraries/C and C++
Requires: device-mapper
%description devel
@ -153,7 +153,7 @@ This library enables the use of libmultipath commands from C code.
%package -n libdmmp-devel
Summary: Header files for multipath-tools C API
Group: Development/Libraries/Other
Group: Development/Libraries/C and C++
Requires: libdmmp%{libdmmp_version}
%description -n libdmmp-devel
@ -167,16 +167,16 @@ This package provides development files and documentation for libdmmp.
%setup -q -n multipath-tools-%{version}
%build
make CC="%__cc" OPTFLAGS="$RPM_OPT_FLAGS" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags}
make CC="%__cc" OPTFLAGS="%{optflags}" LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags}
%install
make DESTDIR=$RPM_BUILD_ROOT LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} install
mkdir -p $RPM_BUILD_ROOT/var/cache/multipath/
rm $RPM_BUILD_ROOT/%_lib/*.so
mkdir -p $RPM_BUILD_ROOT/usr/sbin
ln -sf /usr/sbin/service $RPM_BUILD_ROOT/usr/sbin/rcmultipathd
mkdir -p $RPM_BUILD_ROOT/usr/lib/modules-load.d
install -m 644 -D %{SOURCE1} "%buildroot/usr/lib/modules-load.d/multipath.conf"
make DESTDIR=%{buildroot} LIB=%{_lib} SYSTEMDPATH=%{_sysdir} %{makeflags} install
mkdir -p %{buildroot}/var/cache/multipath/
rm %{buildroot}/%_lib/*.so
mkdir -p %{buildroot}/usr/sbin
ln -sf /usr/sbin/service %{buildroot}/usr/sbin/rcmultipathd
mkdir -p %{buildroot}/usr/lib/modules-load.d
install -m 644 -D %{SOURCE1} "%{buildroot}/usr/lib/modules-load.d/multipath.conf"
%pre
[ -f /.buildenv ] && exit 0