Hello community,
here is the log from the commit of package grpc-httpjson-transcoding for
openSUSE:Factory checked in at 2020-01-17 16:07:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grpc-httpjson-transcoding (Old)
and /work/SRC/openSUSE:Factory/.grpc-httpjson-transcoding.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grpc-httpjson-transcoding"
Fri Jan 17 16:07:10 2020 rev:4 rq:765177 version:20190920
Changes:
--------
---
/work/SRC/openSUSE:Factory/grpc-httpjson-transcoding/grpc-httpjson-transcoding.changes
2019-11-12 11:56:39.503422354 +0100
+++
/work/SRC/openSUSE:Factory/.grpc-httpjson-transcoding.new.26092/grpc-httpjson-transcoding.changes
2020-01-17 16:07:42.772506059 +0100
@@ -1,0 +2,7 @@
+Fri Jan 17 09:58:19 UTC 2020 - Michał Rostecki <[email protected]>
+
+- Remove all subpackages except source - envoy-proxy needs the
+ whole source tree instead of a library and there is no other
+ consumer of grpc-httpjson-transcoding.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grpc-httpjson-transcoding.spec ++++++
--- /var/tmp/diff_new_pack.V89iCi/_old 2020-01-17 16:07:43.156506240 +0100
+++ /var/tmp/diff_new_pack.V89iCi/_new 2020-01-17 16:07:43.156506240 +0100
@@ -1,7 +1,7 @@
#
# spec file for package grpc-httpjson-transcoding
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,8 +16,6 @@
#
-%define sover 0
-%define libname libgrpc-httpjson-transcoding%{sover}
%define src_install_dir /usr/src/%{name}
Name: grpc-httpjson-transcoding
@@ -30,23 +28,7 @@
Source0: %{name}-%{version}.tar.xz
Source100: grpc-httpjson-transcoding-rpmlintrc
Patch0: 0001-bazel-Update-googleapis-and-do-not-define-custom-BUI.patch
-BuildRequires: abseil-cpp-source
-BuildRequires: bazel-rules-cc-source
-BuildRequires: bazel-rules-go-source
-BuildRequires: bazel-rules-java-source
-BuildRequires: bazel-rules-proto-source
-BuildRequires: bazel-skylib-source
-BuildRequires: bazel-workspaces
-BuildRequires: bazel0.29
BuildRequires: fdupes
-BuildRequires: gcc-c++
-BuildRequires: golang-packaging
-BuildRequires: googleapis-source
-BuildRequires: grpc-source
-BuildRequires: patchelf
-BuildRequires: protobuf-source
-BuildRequires: zlib-devel
-BuildRequires: golang(API) >= 1.11
ExcludeArch: %ix86
%description
@@ -54,25 +36,6 @@
HTTP/JSON can be converted to gRPC. It allows to provide APIs in both gRPC and
REST style at the same time.
-%package -n %{libname}
-Summary: Library for transcoding HTTP/JSON to gRPC
-Group: System/Libraries
-
-%description -n %{libname}
-grpc-httpjson-transcoding is a library that supports transcoding so that
-HTTP/JSON can be converted to gRPC. It allows to provide APIs in both gRPC and
-REST style at the same time.
-
-%package devel
-Summary: Development files for grpc-httpjson-transcoding
-Group: Development/Libraries/C and C++
-Requires: %{libname} = %{version}
-
-%description devel
-Development files for grpc-httpjson-transcoding - a library that supports
-transcoding so that HTTP/JSON can be converted to gRPC. It allows to provide
-APIs in both gRPC and REST style at the same time.
-
%package source
Summary: Source code of grpc-httpjson-transcoding
Group: Development/Sources
@@ -84,121 +47,18 @@
gRPC and REST style at the same time.
%prep
-# Upstream sources of googleapis do not export servicecontrol protobufs for
-# Bazel builds which use googleapis as a dependency. This custom BUILD file
-# expots them.
-# mkdir googleapis
-# cp -r /usr/src/googleapis/* googleapis/
-
%autosetup -p1
-sed -i -e "s|go_register_toolchains()|go_register_toolchains(\"host\")|"
WORKSPACE
-# Unit tests in grpc-httpjson-transcoding are not able to use gtest as a shared
-# library. We don't run tests in this spec, so let's just get rid of them...
-rm test/BUILD
-
-#sed -i 's|@com_google_absl//absl/strings|//:abseil_strings|g' ./src/BUILD
%build
-# TODO(mrostecki): Create a macro in bazel package.
-bazel build \
- -c dbg \
- --color=no \
- %(for opt in %{optflags}; do echo -e "--copt=${opt} \c"; done) \
- --curses=no \
- --override_repository="bazel_skylib=/usr/src/bazel-skylib" \
- --override_repository="com_github_grpc_grpc=/usr/src/grpc" \
- --override_repository="com_google_absl=/usr/src/abseil-cpp" \
- --override_repository="com_google_protobuf=/usr/src/protobuf" \
- --override_repository="googleapis_git=/usr/src/googleapis" \
- --override_repository="io_bazel_rules_go=/usr/src/bazel-rules-go" \
- --override_repository="rules_cc=/usr/src/bazel-rules-cc" \
- --override_repository="rules_java=/usr/src/bazel-rules-java" \
- --override_repository="rules_proto=/usr/src/bazel-rules-proto" \
- --override_repository="zlib=%{_datadir}/bazel-workspaces/zlib" \
- --strip=never \
- --verbose_failures \
- //...
-bazel shutdown
%install
-install -D -m0755 bazel-bin/src/libmessage_stream.so
%{buildroot}%{_libdir}/libmessage_stream.so.%{sover}
-install -D -m0755 bazel-bin/src/libjson_request_translator.so
%{buildroot}%{_libdir}/libjson_request_translator.so.%{sover}
-install -D -m0755 bazel-bin/src/libpath_matcher.so
%{buildroot}%{_libdir}/libpath_matcher.so.%{sover}
-install -D -m0755 bazel-bin/src/libhttp_template.so
%{buildroot}%{_libdir}/libhttp_template.so.%{sover}
-install -D -m0755 bazel-bin/src/libmessage_reader.so
%{buildroot}%{_libdir}/libmessage_reader.so.%{sover}
-install -D -m0755 bazel-bin/src/librequest_weaver.so
%{buildroot}%{_libdir}/librequest_weaver.so.%{sover}
-install -D -m0755 bazel-bin/src/librequest_stream_translator.so
%{buildroot}%{_libdir}/librequest_stream_translator.so.%{sover}
-install -D -m0755 bazel-bin/src/libresponse_to_json_translator.so
%{buildroot}%{_libdir}/libresponse_to_json_translator.so.%{sover}
-install -D -m0755 bazel-bin/src/librequest_message_translator.so
%{buildroot}%{_libdir}/librequest_message_translator.so.%{sover}
-install -D -m0755 bazel-bin/src/libprefix_writer.so
%{buildroot}%{_libdir}/libprefix_writer.so.%{sover}
-install -D -m0755 bazel-bin/src/libtype_helper.so
%{buildroot}%{_libdir}/libtype_helper.so.%{sover}
-# We can't patchelf libraries in the build step, because bazel saves the build
-# output in protected read-only directory.
-patchelf --set-soname libmessage_stream.so.%{sover}
%{buildroot}%{_libdir}/libmessage_stream.so.%{sover}
-patchelf --set-soname libjson_request_translator.so.%{sover}
%{buildroot}%{_libdir}/libjson_request_translator.so.%{sover}
-patchelf --set-soname libpath_matcher.so.%{sover}
%{buildroot}%{_libdir}/libpath_matcher.so.%{sover}
-patchelf --set-soname libhttp_template.so.%{sover}
%{buildroot}%{_libdir}/libhttp_template.so.%{sover}
-patchelf --set-soname libmessage_reader.so.%{sover}
%{buildroot}%{_libdir}/libmessage_reader.so.%{sover}
-patchelf --set-soname librequest_weaver.so.%{sover}
%{buildroot}%{_libdir}/librequest_weaver.so.%{sover}
-patchelf --set-soname librequest_stream_translator.so.%{sover}
%{buildroot}%{_libdir}/librequest_stream_translator.so.%{sover}
-patchelf --set-soname libresponse_to_json_translator.so.%{sover}
%{buildroot}%{_libdir}/libresponse_to_json_translator.so.%{sover}
-patchelf --set-soname librequest_message_translator.so.%{sover}
%{buildroot}%{_libdir}/librequest_message_translator.so.%{sover}
-patchelf --set-soname libprefix_writer.so.%{sover}
%{buildroot}%{_libdir}/libprefix_writer.so.%{sover}
-patchelf --set-soname libtype_helper.so.%{sover}
%{buildroot}%{_libdir}/libtype_helper.so.%{sover}
-ln -sf libmessage_stream.so.%{sover}
%{buildroot}%{_libdir}/libmessage_stream.so
-ln -sf libjson_request_translator.so.%{sover}
%{buildroot}%{_libdir}/libjson_request_translator.so
-ln -sf libpath_matcher.so.%{sover} %{buildroot}%{_libdir}/libpath_matcher.so
-ln -sf libhttp_template.so.%{sover} %{buildroot}%{_libdir}/libhttp_template.so
-ln -sf libmessage_reader.so.%{sover}
%{buildroot}%{_libdir}/libmessage_reader.so
-ln -sf librequest_weaver.so.%{sover}
%{buildroot}%{_libdir}/librequest_weaver.so
-ln -sf librequest_stream_translator.so.%{sover}
%{buildroot}%{_libdir}/librequest_stream_translator.so
-ln -sf libresponse_to_json_translator.so.%{sover}
%{buildroot}%{_libdir}/libresponse_to_json_translator.so
-ln -sf librequest_message_translator.so.%{sover}
%{buildroot}%{_libdir}/librequest_message_translator.so
-ln -sf libprefix_writer.so.%{sover} %{buildroot}%{_libdir}/libprefix_writer.so
-ln -sf libtype_helper.so.%{sover} %{buildroot}%{_libdir}/libtype_helper.so
-for header in $(find src/include -name "*.h" -printf "%%P\n"); do
- install -D -m0644 src/include/$header %{buildroot}%{_includedir}/$header
-done
-
-# Install sources
-rm -rf "bazel-*"
mkdir -p %{buildroot}%{src_install_dir}
cp -r * %{buildroot}%{src_install_dir}
%fdupes %{buildroot}%{src_install_dir}
-%post -n %{libname} -p /sbin/ldconfig
-%postun -n %{libname} -p /sbin/ldconfig
-
-%files -n %{libname}
+%files source
%license LICENSE
%doc README.md
-%{_libdir}/libhttp_template.so.0
-%{_libdir}/libjson_request_translator.so.0
-%{_libdir}/libmessage_reader.so.0
-%{_libdir}/libmessage_stream.so.0
-%{_libdir}/libpath_matcher.so.0
-%{_libdir}/libprefix_writer.so.0
-%{_libdir}/librequest_message_translator.so.0
-%{_libdir}/librequest_stream_translator.so.0
-%{_libdir}/librequest_weaver.so.0
-%{_libdir}/libresponse_to_json_translator.so.0
-%{_libdir}/libtype_helper.so.0
-
-%files devel
-%{_includedir}/grpc_transcoding
-%{_libdir}/libhttp_template.so
-%{_libdir}/libjson_request_translator.so
-%{_libdir}/libmessage_reader.so
-%{_libdir}/libmessage_stream.so
-%{_libdir}/libpath_matcher.so
-%{_libdir}/libprefix_writer.so
-%{_libdir}/librequest_message_translator.so
-%{_libdir}/librequest_stream_translator.so
-%{_libdir}/librequest_weaver.so
-%{_libdir}/libresponse_to_json_translator.so
-%{_libdir}/libtype_helper.so
-
-%files source
%{src_install_dir}
%changelog
