[gtest] - Add python to buildreq
terjeros
terjeros at fedoraproject.org
Sun Jan 16 21:05:37 UTC 2011
commit 3dad48f3af760dd9aa8f5d560c65f523a8eb341c
Author: Terje Røsten <terje.rosten at ntnu.no>
Date: Sun Jan 16 22:05:24 2011 +0100
- Add python to buildreq
gtest.spec | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
---
diff --git a/gtest.spec b/gtest.spec
index 6f4b6ac..0250d21 100644
--- a/gtest.spec
+++ b/gtest.spec
@@ -1,12 +1,13 @@
-Summary: Google C++ testing framework
-Name: gtest
-Version: 1.5.0
-Release: 1%{?dist}
-License: BSD
-Group: Development/Tools
-URL: http://code.google.com/p/googletest/
-Source0: http://googletest.googlecode.com/files/gtest-%{version}.tar.bz2
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+Summary: Google C++ testing framework
+Name: gtest
+Version: 1.5.0
+Release: 2%{?dist}
+License: BSD
+Group: Development/Tools
+URL: http://code.google.com/p/googletest/
+Source0: http://googletest.googlecode.com/files/gtest-%{version}.tar.bz2
+BuildRequires: python
+BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
%description
Google's framework for writing C++ tests on a variety of platforms
@@ -19,7 +20,6 @@ generation.
%package devel
Summary: Development files for %{name}
Group: Development/Libraries
-
Requires: automake
Requires: %{name} = %{version}-%{release}
@@ -43,7 +43,9 @@ make %{?_smp_mflags}
%check
# Two tests fail here, unclear as to why.
-make check AM_LDFLAGS='-Wl,--add-needed' ||:
+# Some extra magic, however still fails...
+export LD_LIBRARY_PATH=$(pwd)/lib/.libs
+make check AM_LDFLAGS='-Wl,--add-needed' LDFLAGS='lib/.libs/libgtest.so' || :
# Restore the clean copy of samples.
# To be later listed against doc.
@@ -78,6 +80,9 @@ rm -rf %{buildroot}
%{_includedir}/gtest
%changelog
+* Sun Jan 16 2011 Terje Rosten <terje.rosten at ntnu.no> - 1.5.0-2
+- Add python to buildreq
+
* Wed Jan 12 2011 Terje Rosten <terje.rosten at ntnu.no> - 1.5.0-1
- 1.5.0
- some cleanup
More information about the scm-commits
mailing list