diff --git a/10355.patch b/10355.patch index 6e23ffa..db7d8ee 100644 --- a/10355.patch +++ b/10355.patch @@ -7,16 +7,16 @@ Subject: [PATCH 1/2] Use release version instead of libtool version src/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -Index: protobuf-21.9/src/Makefile.am +Index: protobuf-21.10/src/Makefile.am =================================================================== ---- protobuf-21.9.orig/src/Makefile.am -+++ protobuf-21.9/src/Makefile.am +--- protobuf-21.10.orig/src/Makefile.am ++++ protobuf-21.10/src/Makefile.am @@ -18,7 +18,7 @@ else PTHREAD_DEF = endif --PROTOBUF_VERSION = 32:9:0 -+PROTOBUF_VERSION = 3.21.9 +-PROTOBUF_VERSION = 32:10:0 ++PROTOBUF_VERSION = 3.21.10 if GCC # Turn on all warnings except for sign comparison (we ignore sign comparison @@ -47,10 +47,10 @@ Index: protobuf-21.9/src/Makefile.am if HAVE_LD_VERSION_SCRIPT libprotoc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libprotoc.map EXTRA_libprotoc_la_DEPENDENCIES = libprotoc.map -Index: protobuf-21.9/cmake/libprotobuf-lite.cmake +Index: protobuf-21.10/cmake/libprotobuf-lite.cmake =================================================================== ---- protobuf-21.9.orig/cmake/libprotobuf-lite.cmake -+++ protobuf-21.9/cmake/libprotobuf-lite.cmake +--- protobuf-21.10.orig/cmake/libprotobuf-lite.cmake ++++ protobuf-21.10/cmake/libprotobuf-lite.cmake @@ -112,7 +112,6 @@ if(protobuf_BUILD_SHARED_LIBS) endif() set_target_properties(libprotobuf-lite PROPERTIES @@ -59,10 +59,10 @@ Index: protobuf-21.9/cmake/libprotobuf-lite.cmake OUTPUT_NAME ${LIB_PREFIX}protobuf-lite DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") add_library(protobuf::libprotobuf-lite ALIAS libprotobuf-lite) -Index: protobuf-21.9/cmake/libprotobuf.cmake +Index: protobuf-21.10/cmake/libprotobuf.cmake =================================================================== ---- protobuf-21.9.orig/cmake/libprotobuf.cmake -+++ protobuf-21.9/cmake/libprotobuf.cmake +--- protobuf-21.10.orig/cmake/libprotobuf.cmake ++++ protobuf-21.10/cmake/libprotobuf.cmake @@ -128,7 +128,6 @@ if(protobuf_BUILD_SHARED_LIBS) endif() set_target_properties(libprotobuf PROPERTIES @@ -71,10 +71,10 @@ Index: protobuf-21.9/cmake/libprotobuf.cmake OUTPUT_NAME ${LIB_PREFIX}protobuf DEBUG_POSTFIX "${protobuf_DEBUG_POSTFIX}") add_library(protobuf::libprotobuf ALIAS libprotobuf) -Index: protobuf-21.9/cmake/libprotoc.cmake +Index: protobuf-21.10/cmake/libprotoc.cmake =================================================================== ---- protobuf-21.9.orig/cmake/libprotoc.cmake -+++ protobuf-21.9/cmake/libprotoc.cmake +--- protobuf-21.10.orig/cmake/libprotoc.cmake ++++ protobuf-21.10/cmake/libprotoc.cmake @@ -130,7 +130,6 @@ endif() set_target_properties(libprotoc PROPERTIES COMPILE_DEFINITIONS LIBPROTOC_EXPORTS diff --git a/baselibs.conf b/baselibs.conf index f787b08..f28fff5 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libprotobuf3_21_9 -libprotoc3_21_9 -libprotobuf-lite3_21_9 +libprotobuf3_21_10 +libprotoc3_21_10 +libprotobuf-lite3_21_10 diff --git a/protobuf-21.10.tar.gz b/protobuf-21.10.tar.gz new file mode 100644 index 0000000..abefa99 --- /dev/null +++ b/protobuf-21.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3f9ce6dc288f2f939bdc9d277ebdfbc8dbcd51741071f93da70e0e62919f57f +size 5114104 diff --git a/protobuf-21.9.tar.gz b/protobuf-21.9.tar.gz deleted file mode 100644 index e56c1b1..0000000 --- a/protobuf-21.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0aa7df8289c957a4c54cbe694fbabe99b180e64ca0f8fdb5e2f76dcf56ff2422 -size 5110670 diff --git a/protobuf.changes b/protobuf.changes index d23024b..01d31c9 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 5 20:51:53 UTC 2022 - Dirk Müller + +- update to 21.10: + * Java + * Use bit-field int values in buildPartial to skip work on unset groups of + fields. (#10960) + * Mark nested builder as clean after clear is called (#10984) + ------------------------------------------------------------------- Sat Oct 29 12:20:55 UTC 2022 - Dirk Müller diff --git a/protobuf.spec b/protobuf.spec index cc6b1fb..474e424 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -17,7 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define sover 3_21_9 +%define sover 3_21_10 %define tarname protobuf %define src_install_dir %{_prefix}/src/%{name} %define extra_java_flags -source 7 -target 7 @@ -27,7 +27,7 @@ %bcond_without python2 %bcond_without python3 Name: protobuf -Version: 21.9 +Version: 21.10 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause