From 57bf11593149fab26fb23570a04f722808132465ea6fc99508e2afad6448201a Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 27 Apr 2023 15:09:22 +0000 Subject: [PATCH 1/2] Accepting request 1083182 from Java:packages Allow building on older systems OBS-URL: https://build.opensuse.org/request/show/1083182 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=143 --- protobuf-rpmlintrc | 3 +++ protobuf.changes | 6 ++++++ protobuf.spec | 4 ++++ 3 files changed, 13 insertions(+) create mode 100644 protobuf-rpmlintrc diff --git a/protobuf-rpmlintrc b/protobuf-rpmlintrc new file mode 100644 index 0000000..f8008a5 --- /dev/null +++ b/protobuf-rpmlintrc @@ -0,0 +1,3 @@ +addFilter("shlib-policy-name-error") +addFilter("env-script-interpreter") +addFilter("spurious-executable-perm") diff --git a/protobuf.changes b/protobuf.changes index 99ffd20..8125e88 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Apr 27 06:59:31 UTC 2023 - Fridrich Strba + +- Make possible to build on older systems, like SLE12 that miss + some of the used macros. + ------------------------------------------------------------------- Thu Mar 23 09:01:50 UTC 2023 - Martin Liška diff --git a/protobuf.spec b/protobuf.spec index 8b7cc2e..5bcfeda 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -16,6 +16,7 @@ # +%{!?make_build:%global make_build make %{?_smp_mflags}} %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define sover 3_21_12 %define tarname protobuf @@ -167,6 +168,9 @@ This package contains the Python bindings for Google Protocol Buffers. %prep %autosetup -p1 -n %{tarname}-%{version} + +# The previous blank line is crucial for older system being able +# to use the autosetup macro mkdir gmock %if %{with python2} || %{with python3} From dbb3b2b27792d34d8e968b8b2361d85e3c43dd6f23a0728a940baa5eeb676bb9 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 28 Apr 2023 07:45:03 +0000 Subject: [PATCH 2/2] Accepting request 1083437 from Java:packages make acceptable for factory bots OBS-URL: https://build.opensuse.org/request/show/1083437 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=144 --- protobuf.changes | 5 +++++ protobuf.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/protobuf.changes b/protobuf.changes index 8125e88..3e3d10f 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Apr 28 07:07:50 UTC 2023 - Fridrich Strba + +- Mention the rpmlintrc file in the spec. + ------------------------------------------------------------------- Thu Apr 27 06:59:31 UTC 2023 - Fridrich Strba diff --git a/protobuf.spec b/protobuf.spec index 5bcfeda..3160592 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -37,6 +37,7 @@ URL: https://github.com/protocolbuffers/protobuf Source0: https://github.com/protocolbuffers/protobuf/archive/v%{version}.tar.gz#/%{tarname}-%{version}.tar.gz Source1: manifest.txt.in Source2: baselibs.conf +Source1000: %{name}-rpmlintrc Patch0: gcc12-disable-__constinit-with-c++-11.patch # https://github.com/protocolbuffers/protobuf/pull/10355 Patch1: 10355.patch