Accepting request 708760 from devel:tools:building

OBS-URL: https://build.opensuse.org/request/show/708760
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf?expand=0&rev=38

0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch

@@ -1,28 +0,0 @@
-From e94bf13e6e834610bffb8c54a8fb523dc7f9d229 Mon Sep 17 00:00:00 2001
-From: Ittai Zeidman <ittaiz@gmail.com>
-Date: Mon, 21 May 2018 23:48:10 +0300
-Subject: [PATCH] remove PACKAGE_NAME and REPOSITORY_NAME deprecated usage
- (#4650)
-
----
- protobuf.bzl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/protobuf.bzl b/protobuf.bzl
-index 78f19c62..4226a142 100644
---- a/protobuf.bzl
-+++ b/protobuf.bzl
-@@ -266,8 +266,8 @@ def internal_gen_well_known_protos_java(srcs):
-   Args:
-     srcs: the well known protos
-   """
--  root = Label("%s//protobuf_java" % (REPOSITORY_NAME)).workspace_root
--  pkg = PACKAGE_NAME + "/" if PACKAGE_NAME else ""
-+  root = Label("%s//protobuf_java" % (native.repository_name())).workspace_root
-+  pkg = native.package_name() + "/" if native.package_name() else ""
-   if root == "":
-     include = " -I%ssrc " % pkg
-   else:
--- 
-2.20.1
-

baselibs.conf

@@ -1,3 +1,3 @@
-libprotobuf17
-libprotoc17
-libprotobuf-lite17
+libprotobuf19
+libprotoc19
+libprotobuf-lite19

protobuf-3.6.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b
-size 4485582

protobuf-3.8.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:03d2e5ef101aee4c2f6ddcf145d2a04926b9c19e7086944df3842b1b8502b783
+size 4934577

protobuf.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Sat Jun  8 06:13:57 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Specify java source and target levels in order to build
+  compatible protobuf-java binaries
+
+-------------------------------------------------------------------
+Wed Jun  5 18:58:30 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 3.8.0
+  * Introduced new MOMI (maybe-outside-memory-interval) parser.
+  * Added use of C++ override keyword where appropriate.
+  * Always declare enums to be int-sized.
+  * Append '_' to C++ reserved keywords for message, enum, extension.
+- Remove 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch
+  (upstreamed)
+
 -------------------------------------------------------------------
 Wed Apr 24 17:35:37 UTC 2019 - Martin Liška <mliska@suse.cz>
 

protobuf.spec

@@ -17,16 +17,17 @@
 
 
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
-%define sover 17
+%define sover 19
 %define tarname protobuf
 %define src_install_dir /usr/src/%{name}
+%define extra_java_flags -source 7 -target 7
 # requires gmock, which is not yet in the distribution
 %bcond_with check
 %bcond_without java
 %bcond_without python2
 %bcond_without python3
 Name:           protobuf
-Version:        3.6.1
+Version:        3.8.0
 Release:        0
 Summary:        Protocol Buffers - Google's data interchange format
 License:        BSD-3-Clause
@@ -35,7 +36,6 @@ URL:            https://github.com/google/protobuf/
 Source0:        https://github.com/google/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz
 Source1:        manifest.txt.in
 Source2:        baselibs.conf
-Patch0:         0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch
 BuildRequires:  %{python_module devel}
 BuildRequires:  %{python_module python-dateutil}
 BuildRequires:  %{python_module python-gflags}
@@ -141,9 +141,7 @@ Group:          Development/Libraries/Python
 This package contains the Python bindings for Google Protocol Buffers.
 
 %prep
-
-%setup -q -n %{tarname}-%{version}
-%patch0 -p1
+%autosetup -n %{tarname}-%{version}
 mkdir gmock
 
 %if %{with python2} || %{with python3}
@@ -165,10 +163,9 @@ make %{?_smp_mflags}
 
 %if %{with java}
 pushd java
-%pom_remove_parent
 ../src/protoc --java_out=core/src/main/java -I../src ../src/google/protobuf/descriptor.proto
 mkdir classes
-javac $extra_java_flags -d classes core/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
@@ -208,9 +205,6 @@ popd
 
 mkdir -p %{buildroot}%{src_install_dir}
 tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir}
-pushd %{buildroot}%{src_install_dir}
-patch -p1 < %{PATCH0}
-popd
 %fdupes %{buildroot}%{src_install_dir}
 # Fix env-script-interpreter rpmlint error
 find %{buildroot}%{src_install_dir} -type f -name "*.js" -exec sed -i 's|#!.*/usr/bin/env node|#!/usr/bin/node|' "{}" +