From eeb8be84c73683129f10ad46de1fb082754dc649 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Terje=20R=C3=B8sten?= Date: Tue, 22 Jul 2014 14:02:48 +0200 Subject: [PATCH] Fix buildreq --- gtest.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gtest.spec b/gtest.spec index 9d76866..6e04e41 100644 --- a/gtest.spec +++ b/gtest.spec @@ -9,7 +9,7 @@ Source0: http://googletest.googlecode.com/files/gtest-%{version}.zip Patch0: gtest-soname.patch BuildRequires: cmake BuildRequires: libtool -BuildRequires: python +BuildRequires: python-devel %description Google's framework for writing C++ tests on a variety of platforms @@ -38,19 +38,18 @@ cp -a ./samples ./samples.orig %build # this is odd but needed only to generate gtest-config. %configure -mkdir build -pushd build +mkdir build && pushd build %cmake -DBUILD_SHARED_LIBS=ON \ -DCMAKE_SKIP_BUILD_RPATH=TRUE \ -DPYTHON_EXECUTABLE=%{__python2} \ - -Dgtest_build_tests=ON \ - .. -popd -make %{?_smp_mflags} -C build + -Dgtest_build_tests=ON .. +make %{?_smp_mflags} %check # LD_LIBRARY_PATH needed due to cmake_skip_rpath in %%build -LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/build make test -C build +pushd build +LD_LIBRARY_PATH=$RPM_BUILD_DIR/%{name}-%{version}/build make test +popd # Restore the clean copy of samples. # To be later listed against doc.