Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2012-04-18 12:35:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2012-01-04 07:30:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new/protobuf.changes 2012-04-18 12:35:08.000000000 +0200 @@ -1,0 +2,13 @@ +Fri Mar 16 16:15:25 UTC 2012 - dims...@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. + +------------------------------------------------------------------- New: ---- gtest-1.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.Jf6fh4/_old 2012-04-18 12:35:12.000000000 +0200 +++ /var/tmp/diff_new_pack.Jf6fh4/_new 2012-04-18 12:35:12.000000000 +0200 @@ -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 @@ 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 @@ %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} # -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
