From f316c73a8d6141162476abf5e4c38d898f79e799bb71d93b72fa4e49c8b24754 Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Mon, 3 Jul 2023 08:00:47 +0000
Subject: [PATCH] - update to 23.3:   C++   * Regenerate stale files   * Use
 the same ABI for static and shared libraries on non-     Windows platforms  
 * Add a workaround for GCC constexpr bug   Objective-C   * Regenerate stale
 files   UPB (Python/PHP/Ruby C-Extension)   * Fixed a bug in
 `upb_Map_Delete()` that caused crashes in     map.delete(k) for Ruby when
 string-keyed maps were in use.   Compiler   * Add missing header to
 Objective-c generator   * Add a workaround for GCC constexpr bug   Java   *
 Rollback of: Simplify protobuf Java message builder by     removing methods
 that calls the super class only.   Csharp   * [C#] Replace regex that
 validates descriptor names - drop
 0001-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch (upstream)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=162
---
 baselibs.conf        |  6 +++---
 protobuf-22.5.tar.gz |  3 ---
 protobuf-23.3.tar.gz |  3 +++
 protobuf.changes     | 28 ++++++++++++++++++++++++++++
 protobuf.spec        | 10 +++++-----
 5 files changed, 39 insertions(+), 11 deletions(-)
 delete mode 100644 protobuf-22.5.tar.gz
 create mode 100644 protobuf-23.3.tar.gz

diff --git a/baselibs.conf b/baselibs.conf
index 84d9f38..e2c7bee 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,3 +1,3 @@
-libprotobuf22_5_0
-libprotoc22_5_0
-libprotobuf-lite22_5_0
+libprotobuf23_3_0
+libprotoc23_3_0
+libprotobuf-lite23_3_0
diff --git a/protobuf-22.5.tar.gz b/protobuf-22.5.tar.gz
deleted file mode 100644
index 3c118d6..0000000
--- a/protobuf-22.5.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4b98c800b352e7582bc92ed398999030ce4ebb49c7858dcb070850ec476b72f2
-size 4924661
diff --git a/protobuf-23.3.tar.gz b/protobuf-23.3.tar.gz
new file mode 100644
index 0000000..54c3c2b
--- /dev/null
+++ b/protobuf-23.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e176116949be52b0408dfd24f8925d1eb674a781ae242a75296b17a1c721395
+size 5043803
diff --git a/protobuf.changes b/protobuf.changes
index 2572460..1d4a684 100644
--- a/protobuf.changes
+++ b/protobuf.changes
@@ -1,3 +1,31 @@
+-------------------------------------------------------------------
+Mon Jul  3 07:58:43 UTC 2023 - Dirk Müller <dmueller@suse.com>
+
+- update to 23.3:
+  C++
+  * Regenerate stale files
+  * Use the same ABI for static and shared libraries on non-
+    Windows platforms
+  * Add a workaround for GCC constexpr bug
+
+  Objective-C
+  * Regenerate stale files
+  UPB (Python/PHP/Ruby C-Extension)
+  * Fixed a bug in `upb_Map_Delete()` that caused crashes in
+    map.delete(k) for Ruby when string-keyed maps were in use.
+
+  Compiler
+  * Add missing header to Objective-c generator
+  * Add a workaround for GCC constexpr bug
+
+  Java
+  * Rollback of: Simplify protobuf Java message builder by
+    removing methods that calls the super class only.
+
+  Csharp
+  * [C#] Replace regex that validates descriptor names
+- drop 0001-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch (upstream)
+
 -------------------------------------------------------------------
 Wed Jun 14 08:32:55 UTC 2023 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/protobuf.spec b/protobuf.spec
index c40f632..83584f4 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -25,10 +25,10 @@
 %bcond_without java
 %bcond_without python3
 Name:           protobuf
-Version:        22.5
+Version:        23.3
 # python module have their own version specified in python/google/protobuf/__init__.py
-%global         gversion 22.5
-%global         sover 22_5_0
+%global         gversion 23.3
+%global         sover 23_3_0
 Release:        0
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause
@@ -39,8 +39,6 @@ Source1:        manifest.txt.in
 Source2:        baselibs.conf
 Source1000:     %{name}-rpmlintrc
 Patch0:         add-missing-stdint-header.patch
-# PATCH-FIX-UPSTREAM https://github.com/protocolbuffers/protobuf/commit/4329fde9cf3fab7d1b3a9abe0fbeee1ad8a8b111
-Patch1:         0001-Use-the-same-ABI-for-static-and-shared-libraries-on-.patch
 BuildRequires:  %{python_module abseil}
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module python-dateutil}
@@ -150,6 +148,8 @@ This package contains the Java bindings for Google Protocol Buffers.
 %prep
 %autosetup -p1 -n %{tarname}-%{gversion}
 
+grep -qF "'4.%{VERSION}'" python/google/protobuf/__init__.py
+
 # The previous blank line is crucial for older system being able
 # to use the autosetup macro
 mkdir gmock