Accepting request 109741 from home:dimstar:gcc47

inject gtest 1.5.0 - fixes build with gcc 4.7

OBS-URL: https://build.opensuse.org/request/show/109741
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=19

gtest-1.5.0.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a7350a56d9536d83e41931d4300ca934f71cf09700542191b6267f4a466f20b
+size 592328

protobuf.changes

@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Mar 16 16:15:25 UTC 2012 - dimstar@opensuse.org
+
+- Add gtest-1.5.0.tar.bz2: This is the release tarball of gtest 1.5
+  which is being used by make check. The included 1.4.0 does not
+  work with gcc 4.7, thus replacing the gtest folder with this
+  snapshot.
+- Wrapped the gtest extraction with a version check... on next
+  version the package will fail in order to remember to take this
+  out again (next release of protobuf bundles gtest 1.5.0)
+- Add libtool BuildRequires and call to autoreconf, as gtest 1.5.0
+  needs to be bootstrapped.
+
 -------------------------------------------------------------------
 Wed Dec 21 09:47:32 UTC 2011 - coolo@suse.com
 

protobuf.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package protobuf
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,6 +15,7 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+
 %define soname 7
 
 %bcond_without check
@@ -37,11 +38,16 @@ License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
 Version:        2.4.1
 Release:        0
+# Reminder: Remove gtest 1.5.0 injected tarball.
 Url:            http://code.google.com/p/protobuf/ 
 Source0:        http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
 Source1:        manifest.txt.in
+# gtest 1.5.0 is just there to fuix the build with gcc 4.7... newer version of protobuf includes this.
+Source2:        gtest-1.5.0.tar.bz2
 Patch0:         protobuf-setuptools-2.4.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+# Needed to rebootstrap with gtest 1.5.0
+BuildRequires:  libtool
 BuildRequires:  gcc-c++
 %if 0%{?suse_version} > 1010
 BuildRequires:  fdupes
@@ -128,12 +134,21 @@ This package contains the Python bindings for Google Protocol Buffers.
 
 %setup -q
 %patch0 -p0
+%if "%{version}" == "2.4.1"
+rm -rf gtest
+tar xf %{S:2}
+%else
+echo "Drop this gtest injection hack... any newer version than protobuf 2.4.1 should have gtest 1.5.0 included."
+false
+%endif
 
 %build
 %if 0%{?mandriva_version}
 #XXX something wents wrong with detecting this
 export PTHREAD_LIBS=-lpthread
 %endif
+# Needed due to gtest 1.5.0 injection
+autoreconf -fiv
 %configure --disable-static
 %{__make} %{?jobs:-j%jobs}
 #