rpm/protobuf
SHA256
1
0
Fork 0
forked from pool/protobuf
Code Pull Requests Activity

Accepting request 679026 from home:mrostecki

Browse Source 
- Add upstream patch which fixes build with Bazel 0.22.0.
  * 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch

OBS-URL: https://build.opensuse.org/request/show/679026
OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=70
This commit is contained in:
Martin Pluskal
2019-02-26 08:34:11 +00:00
committed by Git OBS Bridge
parent 4f4d4fffae
commit c467dc3b10
3 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch Normal file
View File

@@ -0,0 +1,28 @@
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

6
protobuf.changes
View File

@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Wed Feb 20 12:29:06 UTC 2019 - Michał Rostecki <mrostecki@opensuse.org>
- Add upstream patch which fixes build with Bazel 0.22.0.
* 0001-remove-PACKAGE_NAME-and-REPOSITORY_NAME-deprecated.patch
-------------------------------------------------------------------
Tue Jan 8 12:35:43 UTC 2019 - Michał Rostecki <mrostecki@suse.de>

5
protobuf.spec
View File

@@ -35,6 +35,7 @@ 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}
@@ -142,6 +143,7 @@ This package contains the Python bindings for Google Protocol Buffers.
%prep
%setup -q -n %{tarname}-%{version}
%patch0 -p1
mkdir gmock
%if %{with python2} || %{with python3}
@@ -205,6 +207,9 @@ 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|' "{}" +