From d8c9afa12f40bf9fcbf9c2e164be95463ae2e5336d15703e3fa3e12a9b381d25 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 6 Jun 2019 05:58:01 +0000 Subject: [PATCH 1/2] Accepting request 707936 from home:jengelh:branches:devel:tools:building - Update to new upstream release 3.8.0 OBS-URL: https://build.opensuse.org/request/show/707936 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=74 --- ..._NAME-and-REPOSITORY_NAME-deprecated.patch | 28 ------------------- baselibs.conf | 6 ++-- protobuf-3.6.1.tar.gz | 3 -- protobuf-3.8.0.tar.gz | 3 ++ protobuf.changes | 11 ++++++++ protobuf.spec | 13 ++------- 6 files changed, 20 insertions(+), 44 deletions(-) delete mode 100644 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch delete mode 100644 protobuf-3.6.1.tar.gz create mode 100644 protobuf-3.8.0.tar.gz diff --git a/0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch b/0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch deleted file mode 100644 index 5f20328..0000000 --- a/0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e94bf13e6e834610bffb8c54a8fb523dc7f9d229 Mon Sep 17 00:00:00 2001 -From: Ittai Zeidman -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 - diff --git a/baselibs.conf b/baselibs.conf index 7e21576..d2f40d0 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,3 +1,3 @@ -libprotobuf17 -libprotoc17 -libprotobuf-lite17 +libprotobuf19 +libprotoc19 +libprotobuf-lite19 diff --git a/protobuf-3.6.1.tar.gz b/protobuf-3.6.1.tar.gz deleted file mode 100644 index 5a04550..0000000 --- a/protobuf-3.6.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3d4e589d81b2006ca603c1ab712c9715a76227293032d05b26fca603f90b3f5b -size 4485582 diff --git a/protobuf-3.8.0.tar.gz b/protobuf-3.8.0.tar.gz new file mode 100644 index 0000000..6fb0155 --- /dev/null +++ b/protobuf-3.8.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03d2e5ef101aee4c2f6ddcf145d2a04926b9c19e7086944df3842b1b8502b783 +size 4934577 diff --git a/protobuf.changes b/protobuf.changes index 0f48c16..6739f7c 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jun 5 18:58:30 UTC 2019 - Jan Engelhardt + +- 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 diff --git a/protobuf.spec b/protobuf.spec index f313c71..1ad77a2 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -17,7 +17,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} -%define sover 17 +%define sover 19 %define tarname protobuf %define src_install_dir /usr/src/%{name} # requires gmock, which is not yet in the distribution @@ -26,7 +26,7 @@ %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 +35,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 +140,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,7 +162,6 @@ 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 @@ -208,9 +204,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|' "{}" + From 8125f843e6186faea399069d21123bf9bc6c8973ba6a0ffab5b32e1af9f6d850 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Sat, 8 Jun 2019 16:22:03 +0000 Subject: [PATCH 2/2] Accepting request 708508 from home:fstrba:maven Specify source and targer levels OBS-URL: https://build.opensuse.org/request/show/708508 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=75 --- protobuf.changes | 6 ++++++ protobuf.spec | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/protobuf.changes b/protobuf.changes index 6739f7c..6c542f4 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Jun 8 06:13:57 UTC 2019 - Fridrich Strba + +- Specify java source and target levels in order to build + compatible protobuf-java binaries + ------------------------------------------------------------------- Wed Jun 5 18:58:30 UTC 2019 - Jan Engelhardt diff --git a/protobuf.spec b/protobuf.spec index 1ad77a2..e525074 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -20,6 +20,7 @@ %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 @@ -164,7 +165,7 @@ make %{?_smp_mflags} pushd java ../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