Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2017-01-19 10:40:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2016-12-29 22:42:15.050195228 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new/protobuf.changes 2017-01-19 10:40:52.718231133 +0100 @@ -1,0 +2,19 @@ +Sat Jan 7 11:02:55 UTC 2017 - stefan.bru...@rwth-aachen.de + +- Update to protobuf v3.1.0. Protobuf v3.0.0 introduceced a new + version of the protocol buffer language, proto3, which supersedes + proto2. + The protoc compiler is able to read old proto2 protocol definitions, + and defaults to the proto2 syntax if a syntax is not specified, thus + packages can be recompiled to link to the new library. For backwards + compatibility, the old library version is available from the + protobuf2 package. + As the API for proto2 is not compatible to the proto3 API, proto3 + should only be used for new Protocol Buffers, whereas current users + are advised to keep using proto2. For a detailed list of changes, + see https://github.com/google/protobuf/releases +- Drop no longer needed patches: + * protobuf-setuptools-2.4.1.patch + * protobuf-return-no-nonvoid.patch + +------------------------------------------------------------------- Old: ---- protobuf-2.6.1.tar.bz2 protobuf-return-no-nonvoid.patch protobuf-setuptools-2.4.1.patch New: ---- protobuf-3.1.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.upQFjC/_old 2017-01-19 10:40:53.390136355 +0100 +++ /var/tmp/diff_new_pack.upQFjC/_new 2017-01-19 10:40:53.394135791 +0100 @@ -1,7 +1,7 @@ # # spec file for package protobuf # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,26 +16,32 @@ # -%define soname 9 -%bcond_without check +%define soname 11 +%define tarname protobuf +# requires gmock, which is not yet in the distribution +%bcond_with check %bcond_without protobuf_java %bcond_without protobuf_python + Name: protobuf -Version: 2.6.1 +Version: 3.1.0 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause Group: Development/Libraries/C and C++ Url: https://github.com/google/protobuf/ -Source0: https://github.com/google/protobuf/releases/download/v%{version}/%{name}-%{version}.tar.bz2 +Source0: https://github.com/google/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz Source1: manifest.txt.in Source2: baselibs.conf -Patch0: protobuf-setuptools-2.4.1.patch -# fix no-return-in-nonvoid-function google/protobuf/extension_set.cc:74 -Patch1: protobuf-return-no-nonvoid.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: autoconf +BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ +%if %{with check} +BuildRequires: libgmock-devel +%endif +BuildRequires: libtool BuildRequires: pkg-config %if %{with protobuf_java} BuildRequires: java-devel >= 1.6.0 @@ -89,6 +95,7 @@ Requires: libprotobuf-lite%{soname} Requires: zlib-devel Provides: libprotobuf-devel = %{version} +Conflicts: protobuf2-devel %description devel Protocol Buffers are a way of encoding structured data in an efficient yet @@ -121,10 +128,9 @@ %prep -%setup -q -%patch0 -%patch1 -p1 -# +%setup -q -n %{tarname}-%{version} +mkdir gmock + %if %{with protobuf_python} # only needed for test suite which we don't call anyways. # googleapis is broken on sle12 @@ -138,6 +144,7 @@ export PTHREAD_LIBS=-lpthread %endif +./autogen.sh %configure \ --disable-static @@ -145,9 +152,9 @@ %if %{with protobuf_java} pushd java -../src/protoc --java_out=src/main/java -I../src ../src/google/protobuf/descriptor.proto +../src/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto mkdir classes -javac -d classes src/main/java/com/google/protobuf/*.java +javac $extra_java_flags -d classes core/src/main/java/com/google/protobuf/*.java sed -e 's/@VERSION@/%{version}/' < %{SOURCE1} > manifest.txt jar cfm %{name}-java-%{version}.jar manifest.txt -C classes com popd ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.upQFjC/_old 2017-01-19 10:40:53.418132406 +0100 +++ /var/tmp/diff_new_pack.upQFjC/_new 2017-01-19 10:40:53.418132406 +0100 @@ -1,3 +1,3 @@ -libprotobuf9 -libprotoc9 -libprotobuf-lite9 +libprotobuf11 +libprotoc11 +libprotobuf-lite11
