Merge remote-tracking branch 'up/master' into master-riscv64

Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>

libstoragemgmt.spec

@@ -9,7 +9,7 @@
 
 Name:           libstoragemgmt
 Version:        1.8.2
-Release:        1%{?dist}
+Release:        1.0.riscv64%{?dist}
 Summary:        Storage array management library
 License:        LGPLv2+
 URL:            https://github.com/libstorage/libstoragemgmt
@@ -37,7 +37,9 @@ BuildRequires:  python3-devel
 BuildRequires:  systemd systemd-devel
 
 BuildRequires:  chrpath
+%ifarch %{valgrind_arches}
 BuildRequires:  valgrind
+%endif
 
 %description
 The libStorageMgmt library will provide a vendor agnostic open source storage
@@ -242,12 +244,21 @@ rm -fr %{py2_build_dir}
 cp -a . %{py2_build_dir}
 %endif
 
-%configure --with-python3 --disable-static
+%configure \
+  --with-python3 \
+%ifnarch %{valgrind_arches}
+  --without-mem-leak-test \
+%endif
+  --disable-static
 V=1 make %{?_smp_mflags}
 
 %if %{with python2}
 pushd %{py2_build_dir}
-%configure --disable-static
+%configure \
+%ifnarch %{valgrind_arches}
+  --without-mem-leak-test \
+%endif
+  --disable-static
 V=1 make %{?_smp_mflags}
 popd
 %endif
@@ -622,6 +633,9 @@ fi
 %{_mandir}/man1/local_lsmplugin.1*
 
 %changelog
+* Mon Jan 20 2020 David Abdurachmanov <david.abdurachmanov@sifive.com> - 1.8.2-1.0.riscv64
+- Use %{valgrind_arches} for valgrind BR
+
 * Tue Dec 10 2019 Tony Asleson <tasleson@redhat.com> - 1.8.2-1
 - Upgrade to 1.8.2