From b973038a2363e1b7b1acbd634115e6837663ca8a90c912b17b28f987bf7a7aff Mon Sep 17 00:00:00 2001
From: Martin Pluskal <mpluskal@suse.com>
Date: Mon, 11 Mar 2024 07:19:58 +0000
Subject: [PATCH] Accepting request 1156655 from
 home:AndreasStieger:branches:devel:tools:building

protobuf 25.3

OBS-URL: https://build.opensuse.org/request/show/1156655
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=175
---
 add-missing-stdint-header.patch | 11 -----------
 baselibs.conf                   |  6 +++---
 protobuf-25.2.tar.gz            |  3 ---
 protobuf-25.3.tar.gz            |  3 +++
 protobuf.changes                | 12 ++++++++++++
 protobuf.spec                   | 10 ++++++----
 6 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 add-missing-stdint-header.patch
 delete mode 100644 protobuf-25.2.tar.gz
 create mode 100644 protobuf-25.3.tar.gz

diff --git a/add-missing-stdint-header.patch b/add-missing-stdint-header.patch
deleted file mode 100644
index cafcc69..0000000
--- a/add-missing-stdint-header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/google/protobuf/port.h.orig	2023-04-24 14:27:40.734888878 +0200
-+++ b/src/google/protobuf/port.h	2023-04-24 14:27:53.607255222 +0200
-@@ -33,6 +33,8 @@
- // port_def.inc and port_undef.inc so they are not visible from outside of
- // protobuf.
- 
-+#include <stdint.h>
-+
- #ifndef GOOGLE_PROTOBUF_PORT_H__
- #define GOOGLE_PROTOBUF_PORT_H__
- 
diff --git a/baselibs.conf b/baselibs.conf
index b86bc3f..ed8fea2 100644
--- a/baselibs.conf
+++ b/baselibs.conf
@@ -1,3 +1,3 @@
-libprotobuf25_2_0
-libprotoc25_2_0
-libprotobuf-lite25_2_0
+libprotobuf25_3_0
+libprotoc25_3_0
+libprotobuf-lite25_3_0
diff --git a/protobuf-25.2.tar.gz b/protobuf-25.2.tar.gz
deleted file mode 100644
index 41c732e..0000000
--- a/protobuf-25.2.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8ff511a64fc46ee792d3fe49a5a1bcad6f7dc50dfbba5a28b0e5b979c17f9871
-size 5878387
diff --git a/protobuf-25.3.tar.gz b/protobuf-25.3.tar.gz
new file mode 100644
index 0000000..8bcab2b
--- /dev/null
+++ b/protobuf-25.3.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d19643d265b978383352b3143f04c0641eea75a75235c111cc01a1350173180e
+size 5878962
diff --git a/protobuf.changes b/protobuf.changes
index 2886932..ffc8c4e 100644
--- a/protobuf.changes
+++ b/protobuf.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Mar  9 20:36:14 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 25.3:
+  * Possibly breaking changes to: C++, Java, PHP, Python, Ruby
+  * message.UnknownFields() is deprecated in pure Python and C++
+    extensions, it will be removed in v26. Use the new
+    UnknownFieldSet(message) support in unknown_fields.py as a
+    replacement
+- make python and java packages noarch
+- drop add-missing-stdint-header.patch no longer required
+
 -------------------------------------------------------------------
 Fri Mar  8 16:25:26 UTC 2024 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/protobuf.spec b/protobuf.spec
index 2006e9b..cd722d4 100644
--- a/protobuf.spec
+++ b/protobuf.spec
@@ -24,17 +24,16 @@
 %bcond_without python3
 %{?sle15_python_module_pythons}
 Name:           protobuf
-Version:        25.2
-%global         sover 25_2_0
+Version:        25.3
+%global         sover 25_3_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/protocolbuffers/protobuf
-Source0:        https://github.com/protocolbuffers/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz
+Source0:        https://github.com/protocolbuffers/protobuf/releases/download/v%{version}/%{tarname}-%{version}.tar.gz
 Source1:        manifest.txt.in
 Source2:        baselibs.conf
-Patch0:         add-missing-stdint-header.patch
 BuildRequires:  %{python_module abseil}
 BuildRequires:  %{python_module devel >= 3.7}
 BuildRequires:  %{python_module python-dateutil}
@@ -118,6 +117,7 @@ RPC protocols and file formats.
 Version:        4.%{VERSION}
 Summary:        Python Bindings for Google Protocol Buffers
 Group:          Development/Libraries/Python
+BuildArch:      noarch
 
 %description -n python-%{name}
 This package contains the Python bindings for Google Protocol Buffers.
@@ -128,6 +128,7 @@ This package contains the Python bindings for Google Protocol Buffers.
 Version:        4.%{VERSION}
 Summary:        Python3 Bindings for Google Protocol Buffers
 Group:          Development/Libraries/Python
+BuildArch:      noarch
 
 %description -n python3-%{name}
 This package contains the Python bindings for Google Protocol Buffers.
@@ -137,6 +138,7 @@ This package contains the Python bindings for Google Protocol Buffers.
 Summary:        Java Bindings for Google Protocol Buffers
 Group:          Development/Libraries/Java
 Requires:       java >= 1.6.0
+BuildArch:      noarch
 
 %description -n %{name}-java
 This package contains the Java bindings for Google Protocol Buffers.