From 4e591cac02539f26588454f8784f16b88d4a87c0 Mon Sep 17 00:00:00 2001
From: Dan Horák <dan@danny.cz>
Date: Dec 09 2015 09:58:44 +0000
Subject: - fix build without valgrind (#1289865)


---

diff --git a/hawkey-0.6.2-valgrind-check.patch b/hawkey-0.6.2-valgrind-check.patch
new file mode 100644
index 0000000..42d67b3
--- /dev/null
+++ b/hawkey-0.6.2-valgrind-check.patch
@@ -0,0 +1,15 @@
+diff -up hawkey-0.6.2/tests/CMakeLists.txt.valgrind hawkey-0.6.2/tests/CMakeLists.txt
+--- hawkey-0.6.2/tests/CMakeLists.txt.valgrind	2015-12-09 10:27:53.000000000 +0100
++++ hawkey-0.6.2/tests/CMakeLists.txt	2015-12-09 10:28:12.000000000 +0100
+@@ -34,9 +34,11 @@ TARGET_LINK_LIBRARIES(test_main
+     ${ZLIB_LIBRARY}
+     ${RPMDB_LIBRARY})
+ ADD_TEST(test_main test_main "${CMAKE_CURRENT_SOURCE_DIR}/repos/")
++IF (VALGRIND_PROGRAM)
+ ADD_TEST(test_valgrind ${VALGRIND_PROGRAM} --error-exitcode=1 --leak-check=full
+                        ${CMAKE_CURRENT_BINARY_DIR}/test_main
+                        ${CMAKE_CURRENT_SOURCE_DIR}/repos/)
+ SET_TESTS_PROPERTIES(test_valgrind PROPERTIES ENVIRONMENT "CK_FORK=no")
++ENDIF()
+ 
+ ADD_SUBDIRECTORY (python)
diff --git a/hawkey.spec b/hawkey.spec
index d329414..3b1e5e3 100644
--- a/hawkey.spec
+++ b/hawkey.spec
@@ -9,15 +9,19 @@
 
 Name:		hawkey
 Version:	0.6.2
-Release:	2%{?snapshot}%{?dist}
+Release:	3%{?snapshot}%{?dist}
 Summary:	Library providing simplified C and Python API to libsolv
 Group:		System Environment/Libraries
 License:	LGPLv2+
 URL:		https://github.com/rpm-software-management/%{name}
 # git clone https://github.com/rpm-software-management/hawkey.git && cd hawkey && tito build --tgz
 Source0:	https://github.com/rpm-software-management/%{name}/archive/%{name}-%{version}.tar.gz
+Patch0:		hawkey-0.6.2-valgrind-check.patch
 BuildRequires:	libsolv-devel >= %{libsolv_version}
-BuildRequires:	cmake expat-devel rpm-devel zlib-devel check-devel valgrind
+BuildRequires:	cmake expat-devel rpm-devel zlib-devel check-devel
+%ifnarch s390
+BuildRequires:	valgrind
+%endif
 Requires:	libsolv%{?_isa} >= %{libsolv_version}
 # prevent provides from nonstandard paths:
 %filter_provides_in %{python_sitearch}/.*\.so$
@@ -73,6 +77,7 @@ Python 3 bindings for the hawkey library.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 
 %if %{with python3}
 rm -rf py3
@@ -144,6 +149,9 @@ popd
 %endif
 
 %changelog
+* Wed Dec 09 2015 Dan Horák <dan[at]danny.cz> - 0.6.2-3
+- fix build without valgrind (#1289865)
+
 * Thu Nov 12 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.6.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5