From a426205a6bdff7599fe812e4d4b64bc8ff29ecb9 Mon Sep 17 00:00:00 2001 From: Miloš Jakubíček Date: Sep 01 2009 23:36:15 +0000 Subject: - Fix FTBFS (BZ#511491): fix autotools to find gtest-config --- diff --git a/protobuf.spec b/protobuf.spec index 4269e66..f8f030c 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -13,7 +13,7 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf Version: 2.0.2 -Release: 9%{?dist} +Release: 10%{?dist} License: BSD Group: Development/Libraries Source: http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2 @@ -148,7 +148,14 @@ rm -rf java/src/test %build ./autogen.sh +%if !%{without_gtest} +export GTEST_CONFIG=`which gtest-config` +sed -i -e 's|AS_IF(\[test "x$HAVE_GTEST" = "xyes"\],||' -e 's|\[m4_ifval(\[$2\], \[$2\])\],||' -e 's|\[m4_ifval(\[$3\], \[$3\])\])||' aclocal.m4 +autoconf +%configure --enable-gtest +%else %configure +%endif make %{?_smp_mflags} @@ -268,6 +275,9 @@ rm -rf %{buildroot} %endif %changelog +* Wed Sep 2 2009 Milos Jakubicek - 2.0.2-10 +- Fix FTBFS (BZ#511491): fix autotools to find gtest-config + * Sun Jul 26 2009 Fedora Release Engineering - 2.0.2-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild