Hello community, here is the log from the commit of package protobuf for openSUSE:Factory checked in at 2019-03-01 20:28:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf (Old) and /work/SRC/openSUSE:Factory/.protobuf.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf" Fri Mar 1 20:28:27 2019 rev:36 rq:679166 version:3.6.1 Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf/protobuf.changes 2019-02-04 21:21:52.859647317 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf.new.28833/protobuf.changes 2019-03-01 20:28:31.790024236 +0100 @@ -1,0 +2,6 @@ +Wed Feb 20 12:29:06 UTC 2019 - Michał Rostecki <[email protected]> + +- Add upstream patch which fixes build with Bazel 0.22.0. + * 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch + +------------------------------------------------------------------- New: ---- 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf.spec ++++++ --- /var/tmp/diff_new_pack.YdeALA/_old 2019-03-01 20:28:32.386024092 +0100 +++ /var/tmp/diff_new_pack.YdeALA/_new 2019-03-01 20:28:32.390024091 +0100 @@ -35,6 +35,7 @@ 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} @@ -142,6 +143,7 @@ %prep %setup -q -n %{tarname}-%{version} +%patch0 -p1 mkdir gmock %if %{with python2} || %{with python3} @@ -205,6 +207,9 @@ 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|' "{}" + ++++++ 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch ++++++ >From e94bf13e6e834610bffb8c54a8fb523dc7f9d229 Mon Sep 17 00:00:00 2001 From: Ittai Zeidman <[email protected]> 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
