diff --git a/baselibs.conf b/baselibs.conf index c81c188..60c0e17 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libprotobuf13 -libprotoc13 -libprotobuf-lite13 +libprotobuf15 +libprotoc15 +libprotobuf-lite15 diff --git a/protobuf-3.3.0.tar.gz b/protobuf-3.3.0.tar.gz deleted file mode 100644 index 8092727..0000000 --- a/protobuf-3.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:94c414775f275d876e5e0e4a276527d155ab2d0da45eed6b7734301c330be36e -size 4336596 diff --git a/protobuf-3.5.0.tar.gz b/protobuf-3.5.0.tar.gz new file mode 100644 index 0000000..e4adad6 --- /dev/null +++ b/protobuf-3.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0cc6607e2daa675101e9b7398a436f09167dffb8ca0489b0307ff7260498c13c +size 4565088 diff --git a/protobuf.changes b/protobuf.changes index f31efe2..9011494 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Dec 11 23:42:45 UTC 2017 - jengelh@inai.de + +- Update to new upstream release 3.5.0 + * Proto3 messages are now preserving unknown fields by default. + If you rely on unknowns fields being dropped, use + DiscardUnknownFields() explicitly. + * Deprecated the unsafe_arena_release_* and + unsafe_arena_add_allocated_* methods for string fields. + * Added move constructor and move assignment to RepeatedField, + RepeatedPtrField and google::protobuf::Any. + * Added perfect forwarding in Arena::CreateMessage. + * In-progress experimental support for implicit weak fields + with lite protos. This feature allows the linker to strip out + more unused messages and reduce binary size. +- Rename %soname to %sover to better reflect its use. + ------------------------------------------------------------------- Fri Jun 16 07:57:00 UTC 2017 - mpluskal@suse.com diff --git a/protobuf.spec b/protobuf.spec index dad5434..b098cfe 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -16,7 +16,7 @@ # -%define soname 13 +%define sover 15 %define tarname protobuf # requires gmock, which is not yet in the distribution %bcond_with check @@ -34,7 +34,7 @@ %endif Name: protobuf -Version: 3.3.0 +Version: 3.5.0 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause @@ -49,7 +49,7 @@ BuildRequires: automake BuildRequires: fdupes BuildRequires: gcc-c++ %if %{with check} -BuildRequires: libgmock-devel +BuildRequires: libgmock-devel >= 1.7.0 %endif BuildRequires: libtool BuildRequires: pkg-config @@ -77,29 +77,29 @@ Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. -%package -n libprotobuf%{soname} +%package -n libprotobuf%{sover} Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries -%description -n libprotobuf%{soname} +%description -n libprotobuf%{sover} Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. -%package -n libprotoc%{soname} +%package -n libprotoc%{sover} Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries -%description -n libprotoc%{soname} +%description -n libprotoc%{sover} Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. -%package -n libprotobuf-lite%{soname} +%package -n libprotobuf-lite%{sover} Summary: Protocol Buffers - Google's data interchange format Group: System/Libraries -%description -n libprotobuf-lite%{soname} +%description -n libprotobuf-lite%{sover} Protocol Buffers are a way of encoding structured data in an efficient yet extensible format. Google uses Protocol Buffers for almost all of its internal RPC protocols and file formats. @@ -108,8 +108,8 @@ RPC protocols and file formats. Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ Requires: gcc-c++ -Requires: libprotobuf%{soname} = %{version} -Requires: libprotobuf-lite%{soname} +Requires: libprotobuf%{sover} = %{version} +Requires: libprotobuf-lite%{sover} Requires: zlib-devel Provides: libprotobuf-devel = %{version} Conflicts: protobuf2-devel @@ -175,7 +175,7 @@ sed -i '/google_test_dir/d' python/setup.py export PTHREAD_LIBS=-lpthread %endif -./autogen.sh +autoreconf -fi %configure \ --disable-static @@ -252,30 +252,30 @@ popd %endif %endif -%post -n libprotobuf%{soname} -p /sbin/ldconfig +%post -n libprotobuf%{sover} -p /sbin/ldconfig -%postun -n libprotobuf%{soname} -p /sbin/ldconfig +%postun -n libprotobuf%{sover} -p /sbin/ldconfig -%post -n libprotoc%{soname} -p /sbin/ldconfig +%post -n libprotoc%{sover} -p /sbin/ldconfig -%postun -n libprotoc%{soname} -p /sbin/ldconfig +%postun -n libprotoc%{sover} -p /sbin/ldconfig -%post -n libprotobuf-lite%{soname} -p /sbin/ldconfig +%post -n libprotobuf-lite%{sover} -p /sbin/ldconfig -%postun -n libprotobuf-lite%{soname} -p /sbin/ldconfig +%postun -n libprotobuf-lite%{sover} -p /sbin/ldconfig -%files -n libprotobuf%{soname} +%files -n libprotobuf%{sover} %defattr(-, root, root) %doc LICENSE -%{_libdir}/libprotobuf.so.%{soname}* +%{_libdir}/libprotobuf.so.%{sover}* -%files -n libprotoc%{soname} +%files -n libprotoc%{sover} %defattr(-, root, root) -%{_libdir}/libprotoc.so.%{soname}* +%{_libdir}/libprotoc.so.%{sover}* -%files -n libprotobuf-lite%{soname} +%files -n libprotobuf-lite%{sover} %defattr(-, root, root) -%{_libdir}/libprotobuf-lite.so.%{soname}* +%{_libdir}/libprotobuf-lite.so.%{sover}* %files devel %defattr(-,root,root)