Hello community,
here is the log from the commit of package lightstep-tracer-cpp for
openSUSE:Factory checked in at 2019-11-14 23:56:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/lightstep-tracer-cpp (Old)
and /work/SRC/openSUSE:Factory/.lightstep-tracer-cpp.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "lightstep-tracer-cpp"
Thu Nov 14 23:56:25 2019 rev:3 rq:748471 version:0.8.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/lightstep-tracer-cpp/lightstep-tracer-cpp.changes
2019-03-20 13:21:09.085316691 +0100
+++
/work/SRC/openSUSE:Factory/.lightstep-tracer-cpp.new.26869/lightstep-tracer-cpp.changes
2019-11-14 23:56:26.640456973 +0100
@@ -1,0 +2,13 @@
+Tue Nov 5 10:19:18 UTC 2019 - Michał Rostecki <[email protected]>
+
+- Add patch which makes lightstep-tracer-cpp compatible with
+ newer googleapis:
+ * 0001-bazel-Update-googleapis.patch
+
+-------------------------------------------------------------------
+Tue Nov 5 01:24:10 UTC 2019 - Michał Rostecki <[email protected]>
+
+- Change googleapis' name from lightstep_vendored_googleapis to
+ com_google_googleapis.
+
+-------------------------------------------------------------------
New:
----
0001-bazel-Update-googleapis.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ lightstep-tracer-cpp.spec ++++++
--- /var/tmp/diff_new_pack.PxATM8/_old 2019-11-14 23:56:27.064456826 +0100
+++ /var/tmp/diff_new_pack.PxATM8/_new 2019-11-14 23:56:27.064456826 +0100
@@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
@@ -31,6 +31,7 @@
Source100: %{name}-rpmlintrc
Patch0: lightstep-tracer-cpp-cmake-add-soversion.patch
Patch1: lightstep-tracer-cpp-cmake-use-gnuinstalldirs.patch
+Patch2: 0001-bazel-Update-googleapis.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -68,19 +69,18 @@
distributed tracing.
%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
+%autosetup -p1
%build
%cmake
-%make_jobs
+%cmake_build
%install
%cmake_install
# Install sources
+rm -rf build
mkdir -p %{buildroot}%{src_install_dir}
-tar -xf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir}
+cp -r * %{buildroot}%{src_install_dir}
%fdupes %{src_install_dir}
%post -n %{libname} -p /sbin/ldconfig
++++++ 0001-bazel-Update-googleapis.patch ++++++
>From 2a42ea794ff59e121c8c7de896cbc63625891ee1 Mon Sep 17 00:00:00 2001
From: Michal Rostecki <[email protected]>
Date: Tue, 5 Nov 2019 11:11:57 +0100
Subject: [PATCH] bazel: Update googleapis
Update googleapis to the same version as Envoy is using.
Signed-off-by: Michal Rostecki <[email protected]>
---
WORKSPACE | 63 +++++++++++++++++-----
lightstep-tracer-common/BUILD | 2 +-
.../third_party/googleapis/BUILD | 11 ----
.../third_party/googleapis/WORKSPACE | 0
4 files changed, 52 insertions(+), 24 deletions(-)
delete mode 100644 lightstep-tracer-common/third_party/googleapis/BUILD
delete mode 100644 lightstep-tracer-common/third_party/googleapis/WORKSPACE
diff --git a/WORKSPACE b/WORKSPACE
index 7f9156f..9f6c9f1 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -1,26 +1,65 @@
workspace(name = "com_lightstep_tracer_cpp")
-git_repository(
+load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+
+http_archive(
name = "io_opentracing_cpp",
- remote = "https://github.com/opentracing/opentracing-cpp";,
- commit = "ac50154a7713877f877981c33c3375003b6ebfe1",
+ sha256 =
"6f4d449e6b411708140d8844aa135f97a8d055bcf4e27334ffa2c1394686451f",
+ strip_prefix = "opentracing-cpp-ac50154a7713877f877981c33c3375003b6ebfe1",
+ urls =
["https://github.com/opentracing/opentracing-cpp/archive/ac50154a7713877f877981c33c3375003b6ebfe1.tar.gz";],
)
http_archive(
name = "com_google_protobuf",
- sha256 =
"5d4551193416861cb81c3bc0a428f22a6878148c57c31fb6f8f2aa4cf27ff635",
- strip_prefix = "protobuf-c4f59dcc5c13debc572154c8f636b8a9361aacde",
- urls =
["https://github.com/google/protobuf/archive/c4f59dcc5c13debc572154c8f636b8a9361aacde.tar.gz";],
+ sha256 =
"6adf73fd7f90409e479d6ac86529ade2d45f50494c5c10f539226693cb8fe4f7",
+ strip_prefix = "protobuf-3.10.1",
+ urls = ["https://github.com/google/protobuf/archive/v3.10.1.tar.gz";],
)
http_archive(
name = "com_google_protobuf_cc",
- sha256 =
"5d4551193416861cb81c3bc0a428f22a6878148c57c31fb6f8f2aa4cf27ff635",
- strip_prefix = "protobuf-c4f59dcc5c13debc572154c8f636b8a9361aacde",
- urls =
["https://github.com/google/protobuf/archive/c4f59dcc5c13debc572154c8f636b8a9361aacde.tar.gz";],
+ sha256 =
"6adf73fd7f90409e479d6ac86529ade2d45f50494c5c10f539226693cb8fe4f7",
+ strip_prefix = "protobuf-3.10.1",
+ urls = ["https://github.com/google/protobuf/archive/v3.10.1.tar.gz";],
)
-local_repository(
- name = "lightstep_vendored_googleapis",
- path = "lightstep-tracer-common/third_party/googleapis",
+load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+
+protobuf_deps()
+
+http_archive(
+ name = "com_github_grpc_grpc",
+ sha256 =
"f56ced18740895b943418fa29575a65cc2396ccfa3159fa40d318ef5f59471f9",
+ strip_prefix = "grpc-1.23.0",
+ urls = ["https://github.com/grpc/grpc/archive/v1.23.0.tar.gz";],
+)
+
+load("@com_github_grpc_grpc//bazel:grpc_deps.bzl", "grpc_deps")
+
+grpc_deps()
+
+http_archive(
+ name = "io_bazel_rules_go",
+ urls =
["https://github.com/bazelbuild/rules_go/releases/download/0.18.5/rules_go-0.18.5.tar.gz";],
+ sha256 =
"a82a352bffae6bee4e95f68a8d80a70e87f42c4741e6a448bec11998fcc82329",
+)
+
+load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies",
"go_register_toolchains")
+go_rules_dependencies()
+go_register_toolchains()
+
+http_archive(
+ name = "com_google_googleapis",
+ sha256 =
"c1969e5b72eab6d9b6cfcff748e45ba57294aeea1d96fd04cd081995de0605c2",
+ strip_prefix = "googleapis-be480e391cc88a75cf2a81960ef79c80d5012068",
+ urls =
["https://github.com/google/googleapis/archive/be480e391cc88a75cf2a81960ef79c80d5012068.tar.gz";],
+)
+
+load("@com_google_googleapis//:repository_rules.bzl",
"switched_rules_by_language")
+
+switched_rules_by_language(
+ name = "com_google_googleapis_imports",
+ cc = True,
+ go = True,
+ grpc = True,
)
diff --git a/lightstep-tracer-common/BUILD b/lightstep-tracer-common/BUILD
index 03418c5..a374cd2 100644
--- a/lightstep-tracer-common/BUILD
+++ b/lightstep-tracer-common/BUILD
@@ -2,7 +2,7 @@ proto_library(
name = "collector_proto",
srcs = ["collector.proto"],
deps = [
- "@lightstep_vendored_googleapis//:googleapis_proto",
+ "@com_google_googleapis//google/api:annotations_proto",
"@com_google_protobuf//:timestamp_proto",
],
visibility = ["//visibility:public"],
diff --git a/lightstep-tracer-common/third_party/googleapis/BUILD
b/lightstep-tracer-common/third_party/googleapis/BUILD
deleted file mode 100644
index 2adec34..0000000
--- a/lightstep-tracer-common/third_party/googleapis/BUILD
+++ /dev/null
@@ -1,11 +0,0 @@
-proto_library(
- name = "googleapis_proto",
- srcs = [
- "google/api/annotations.proto",
- "google/api/http.proto",
- ],
- deps = [
- "@com_google_protobuf//:descriptor_proto",
- ],
- visibility = ["//visibility:public"],
-)
diff --git a/lightstep-tracer-common/third_party/googleapis/WORKSPACE
b/lightstep-tracer-common/third_party/googleapis/WORKSPACE
deleted file mode 100644
index e69de29..0000000
--
2.16.4
