[packages/protobuf] - updated 2.5.0 - updated system-gtest patch - tests no longer fail, enable by default

[qboosh]

commit 079f482d7399602d19b8eb75bbc4670544fc588c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 3 09:19:05 2013 +0100

    - updated 2.5.0
    - updated system-gtest patch
    - tests no longer fail, enable by default

 protobuf.spec      | 23 ++++++++++++-----------
 system-gtest.patch | 13 ++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/protobuf.spec b/protobuf.spec
index fa33683..d4fabd1 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -1,21 +1,20 @@
 # TODO:
-#	- add bindings for java
-#	- tests fail: 2 of 5 tests failed
+# - add bindings for java (maven build)
 #
 # Conditional build:
 %bcond_without	python	# Python bindings
-%bcond_with	tests	# perform "make check"
+%bcond_without	tests	# perform "make check"
 
 Summary:	Protocol Buffers - Google's data interchange format
 Summary(pl.UTF-8):	Protocol Buffers - format wymiany danych Google
 Name:		protobuf
-Version:	2.4.1
-Release:	3
+Version:	2.5.0
+Release:	1
 License:	BSD
 Group:		Libraries
 #Source0Download: http://code.google.com/p/protobuf/downloads/list
 Source0:	http://protobuf.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5:	ed436802019c9e1f40cc750eaf78f318
+# Source0-md5:	a72001a9067a4c2c4e0e836d0f92ece4
 Source1:	ftdetect-proto.vim
 Patch0:		system-gtest.patch
 URL:		http://code.google.com/p/protobuf/
@@ -222,17 +221,17 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGES.txt CONTRIBUTORS.txt README.txt
 %attr(755,root,root) %{_bindir}/protoc
 %attr(755,root,root) %{_libdir}/libprotoc.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.7
+%attr(755,root,root) %ghost %{_libdir}/libprotoc.so.8
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libprotobuf.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.7
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf.so.8
 
 %files lite
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libprotobuf-lite.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.7
+%attr(755,root,root) %ghost %{_libdir}/libprotobuf-lite.so.8
 
 %files devel
 %defattr(644,root,root,755)
@@ -242,10 +241,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libprotobuf-lite.la
 %{_libdir}/libprotobuf.la
 %{_libdir}/libprotoc.la
-%{_includedir}/google
-%{_examplesdir}/%{name}-%{version}
+# XXX: dir shared with libtcmalloc
+%dir %{_includedir}/google
+%{_includedir}/google/protobuf
 %{_pkgconfigdir}/protobuf-lite.pc
 %{_pkgconfigdir}/protobuf.pc
+%{_examplesdir}/%{name}-%{version}
 
 %files static
 %defattr(644,root,root,755)
diff --git a/system-gtest.patch b/system-gtest.patch
index 3b223c1..3ae0f5b 100644
--- a/system-gtest.patch
+++ b/system-gtest.patch
@@ -1,16 +1,15 @@
-diff -up protobuf-2.3.0/autogen.sh.orig protobuf-2.3.0/autogen.sh
---- protobuf-2.3.0/autogen.sh.orig	2010-04-21 18:55:43.857266895 -0600
-+++ protobuf-2.3.0/autogen.sh	2010-04-21 19:54:57.386270273 -0600
-@@ -15,25 +15,8 @@ __EOF__
+--- protobuf-2.5.0/autogen.sh.orig	2013-03-03 08:13:52.293540047 +0100
++++ protobuf-2.5.0/autogen.sh	2013-03-03 08:14:36.570204855 +0100
+@@ -15,25 +15,8 @@
    exit 1
  fi
  
 -# Check that gtest is present.  Usually it is already there since the
 -# directory is set up as an SVN external.
 -if test ! -e gtest; then
--  echo "Google Test not present.  Fetching gtest-1.3.0 from the web..."
--  curl http://googletest.googlecode.com/files/gtest-1.3.0.tar.bz2 | tar jx
--  mv gtest-1.3.0 gtest
+-  echo "Google Test not present.  Fetching gtest-1.5.0 from the web..."
+-  curl http://googletest.googlecode.com/files/gtest-1.5.0.tar.bz2 | tar jx
+-  mv gtest-1.5.0 gtest
 -fi
 -
  set -ex
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/protobuf.git/commitdiff/079f482d7399602d19b8eb75bbc4670544fc588c