From d279649968be86c7e94456c691ef7d9a45c9f66ea3e8dbaa47e44ca5e2dc7d01 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 19 Dec 2019 15:41:46 +0000 Subject: [PATCH 1/2] Accepting request 758169 from home:mmnelemane:branches:devel:tools:building Updated to version 3.9.2 OBS-URL: https://build.opensuse.org/request/show/758169 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=81 --- protobuf-3.9.1.tar.gz | 3 --- protobuf-3.9.2.tar.gz | 3 +++ protobuf.changes | 8 ++++++++ protobuf.spec | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) delete mode 100644 protobuf-3.9.1.tar.gz create mode 100644 protobuf-3.9.2.tar.gz diff --git a/protobuf-3.9.1.tar.gz b/protobuf-3.9.1.tar.gz deleted file mode 100644 index aab405c..0000000 --- a/protobuf-3.9.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98e615d592d237f94db8bf033fba78cd404d979b0b70351a9e5aaff725398357 -size 4947402 diff --git a/protobuf-3.9.2.tar.gz b/protobuf-3.9.2.tar.gz new file mode 100644 index 0000000..e985a61 --- /dev/null +++ b/protobuf-3.9.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28caa2e8a14a9854a22bfe9e8b6645978c58b61eb530788d99210044b2051509 +size 5070162 diff --git a/protobuf.changes b/protobuf.changes index 161d824..f98dc03 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Dec 19 12:47:53 UTC 2019 - Madhu Mohan Nelemane + +- Updated to version 3.9.2 + (Objective-C) + * Remove OSReadLittle* due to alignment requirements. (#6678) + * Don't use unions and instead use memcpy for the type swaps. (#6672) + ------------------------------------------------------------------- Fri Sep 27 07:00:11 UTC 2019 - Fridrich Strba diff --git a/protobuf.spec b/protobuf.spec index 01955cf..9a2e9d9 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -27,7 +27,7 @@ %bcond_without python2 %bcond_without python3 Name: protobuf -Version: 3.9.1 +Version: 3.9.2 Release: 0 Summary: Protocol Buffers - Google's data interchange format License: BSD-3-Clause From dccaab8271df126d3f5cca5a12e6269e7f3dfdda49c30d2887563eac8f17e72c Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 20 Dec 2019 09:04:57 +0000 Subject: [PATCH 2/2] - Use tarball provided by upstream - Small package cleanup OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=82 --- protobuf-3.9.2.tar.gz | 4 ++-- protobuf.changes | 6 ++++++ protobuf.spec | 16 ++++++++-------- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/protobuf-3.9.2.tar.gz b/protobuf-3.9.2.tar.gz index e985a61..d17b7bd 100644 --- a/protobuf-3.9.2.tar.gz +++ b/protobuf-3.9.2.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28caa2e8a14a9854a22bfe9e8b6645978c58b61eb530788d99210044b2051509 -size 5070162 +oid sha256:1fbf1c2962af287607232b2eddeaec9b4f4a7a6f5934e1a9276e9af76952f7e0 +size 4947582 diff --git a/protobuf.changes b/protobuf.changes index f98dc03..70d8159 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Dec 20 09:04:24 UTC 2019 - Martin Pluskal + +- Use tarball provided by upstream +- Small package cleanup + ------------------------------------------------------------------- Thu Dec 19 12:47:53 UTC 2019 - Madhu Mohan Nelemane diff --git a/protobuf.spec b/protobuf.spec index 9a2e9d9..5e15f74 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -1,7 +1,7 @@ # # spec file for package protobuf # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define sover 20 %define tarname protobuf -%define src_install_dir /usr/src/%{name} +%define src_install_dir %{_prefix}/src/%{name} %define extra_java_flags -source 7 -target 7 # requires gmock, which is not yet in the distribution %bcond_with check @@ -208,13 +208,13 @@ mkdir -p %{buildroot}%{src_install_dir} tar -xzf %{SOURCE0} --strip-components=1 -C %{buildroot}%{src_install_dir} %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|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*/usr/bin/env python2.7|#!/usr/bin/python2.7|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*/usr/bin/env python|#!/usr/bin/python|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.rb" -exec sed -i 's|#!.*/usr/bin/env ruby|#!/usr/bin/ruby|' "{}" + -find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec sed -i 's|#!.*/usr/bin/env bash|#!/bin/bash|' "{}" + +find %{buildroot}%{src_install_dir} -type f -name "*.js" -exec sed -i 's|#!.*%{_bindir}/env node|#!%{_bindir}/node|' "{}" + +find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*%{_bindir}/env python2.7|#!%{_bindir}/python2.7|' "{}" + +find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!.*%{_bindir}/env python|#!%{_bindir}/python|' "{}" + +find %{buildroot}%{src_install_dir} -type f -name "*.rb" -exec sed -i 's|#!.*%{_bindir}/env ruby|#!%{_bindir}/ruby|' "{}" + +find %{buildroot}%{src_install_dir} -type f -name "*.sh" -exec sed -i 's|#!.*%{_bindir}/env bash|#!/bin/bash|' "{}" + # And stop requiring ridiculously old Python version -find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!/usr/bin/python2.4|#!/usr/bin/python2.7|' "{}" + +find %{buildroot}%{src_install_dir} -type f -name "*.py" -exec sed -i 's|#!%{_bindir}/python2.4|#!%{_bindir}/python2.7|' "{}" + # Fix spurious-executable-perm rpmlint error chmod -x %{buildroot}%{src_install_dir}/src/google/protobuf/arenastring.h chmod -x %{buildroot}%{src_install_dir}/src/google/protobuf/compiler/js/js_generator.h