rpms/protobuf/devel protobuf.spec,1.6,1.7

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/protobuf/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8754

Modified Files:
	protobuf.spec 
Log Message:
- Fix FTBFS (BZ#511491): fix autotools to find gtest-config




Index: protobuf.spec
===================================================================
RCS file: /cvs/pkgs/rpms/protobuf/devel/protobuf.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- protobuf.spec	26 Jul 2009 19:29:54 -0000	1.6
+++ protobuf.spec	1 Sep 2009 23:36:15 -0000	1.7
@@ -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 <xjakub at fi.muni.cz> - 2.0.2-10
+- Fix FTBFS (BZ#511491): fix autotools to find gtest-config
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.2-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild