From 0f185b204bd17098ca9abe13294461b87503c0b8 Mon Sep 17 00:00:00 2001 From: Felix Kaechele Date: Tue, 20 Nov 2018 18:04:27 +0100 Subject: [PATCH] Update to 3.6.1 Signed-off-by: Igor Gnatenko --- .gitignore | 1 + 0001-fix-build-on-s390x.patch | 26 ----------------------- protobuf.spec | 39 +++++++++++------------------------ sources | 2 +- 4 files changed, 14 insertions(+), 54 deletions(-) delete mode 100644 0001-fix-build-on-s390x.patch diff --git a/.gitignore b/.gitignore index 127a8aa..de34522 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ protobuf-2.3.0.tar.bz2 /protobuf-3.3.1.tar.gz /protobuf-3.4.1.tar.gz /protobuf-3.5.0.tar.gz +/protobuf-3.6.1-all.tar.gz diff --git a/0001-fix-build-on-s390x.patch b/0001-fix-build-on-s390x.patch deleted file mode 100644 index 611a177..0000000 --- a/0001-fix-build-on-s390x.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 3db1323d1d6132f08d0bafbd8602da7d71456745 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Tue, 28 Nov 2017 20:58:00 +0100 -Subject: [PATCH] fix build on s390x - -Signed-off-by: Igor Gnatenko ---- - src/google/protobuf/stubs/atomicops.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/google/protobuf/stubs/atomicops.h b/src/google/protobuf/stubs/atomicops.h -index cb4553b1..34278f3a 100644 ---- a/src/google/protobuf/stubs/atomicops.h -+++ b/src/google/protobuf/stubs/atomicops.h -@@ -214,7 +214,7 @@ Atomic64 Release_Load(volatile const Atomic64* ptr); - #elif defined(GOOGLE_PROTOBUF_ARCH_PPC) - #include - #elif (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)) || (__GNUC__ > 4)) --#include -+#include - #elif defined(__clang__) - #if __has_extension(c_atomic) - #include --- -2.15.0 - diff --git a/protobuf.spec b/protobuf.spec index afc6ee4..92deeac 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -11,18 +11,16 @@ Summary: Protocol Buffers - Google's data interchange format Name: protobuf -Version: 3.5.0 -Release: 8%{?dist} +Version: 3.6.1 +Release: 1%{?dist} License: BSD -URL: https://github.com/google/protobuf -Source: https://github.com/google/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}.tar.gz +URL: https://github.com/protocolbuffers/protobuf +Source: https://github.com/protocolbuffers/protobuf/archive/v%{version}%{?rcver}/%{name}-%{version}%{?rcver}-all.tar.gz Source1: ftdetect-proto.vim Source2: protobuf-init.el # For tests Source3: https://github.com/google/googlemock/archive/release-1.7.0.tar.gz#/googlemock-1.7.0.tar.gz Source4: https://github.com/google/googletest/archive/release-1.7.0.tar.gz#/googletest-1.7.0.tar.gz -# Might be upstreamable, but for now temporary workaround -Patch0: 0001-fix-build-on-s390x.patch BuildRequires: autoconf BuildRequires: automake @@ -186,6 +184,7 @@ BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.easymock:easymock) Conflicts: %{name}-compiler > %{version} Conflicts: %{name}-compiler < %{version} +Obsoletes: %{name}-javanano < 3.6.0 %description java This package contains Java Protocol Buffers runtime library. @@ -205,15 +204,6 @@ BuildArch: noarch %description javadoc This package contains the API documentation for %{name}-java. -%package javanano -Summary: Protocol Buffer JavaNano API -BuildArch: noarch - -%description javanano -JavaNano is a special code generator and runtime -library designed specially for resource-restricted -systems, like Android. - %package parent Summary: Protocol Buffer Parent POM BuildArch: noarch @@ -237,11 +227,6 @@ chmod 644 examples/* rm java/core/src/test/java/com/google/protobuf/ServiceTest.java #rm -r java/core/src/test -# used by https://github.com/googlei18n/libphonenumber -%pom_xpath_inject "pom:project/pom:modules" "../javanano" java -%pom_remove_parent javanano -%pom_remove_dep org.easymock:easymockclassextension javanano - # Make OSGi dependency on sun.misc package optional %pom_xpath_inject "pom:configuration/pom:instructions" "sun.misc;resolution:=optional,*" java/core @@ -316,13 +301,13 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} %ldconfig_scriptlets compiler %files -%{_libdir}/libprotobuf.so.15* +%{_libdir}/libprotobuf.so.17* %doc CHANGES.txt CONTRIBUTORS.txt README.md %license LICENSE %files compiler %{_bindir}/protoc -%{_libdir}/libprotoc.so.15* +%{_libdir}/libprotoc.so.17* %doc README.md %license LICENSE @@ -339,7 +324,7 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} %{_libdir}/libprotoc.a %files lite -%{_libdir}/libprotobuf-lite.so.15* +%{_libdir}/libprotobuf-lite.so.17* %files lite-devel %{_libdir}/libprotobuf-lite.so @@ -388,15 +373,15 @@ install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{emacs_startdir} %files javadoc -f .mfiles-javadoc %license LICENSE -%files javanano -f .mfiles-protobuf-javanano -%doc javanano/README.md -%license LICENSE - %files parent -f .mfiles-protobuf-parent %license LICENSE %endif %changelog +* Tue Oct 23 2018 Felix Kaechele - 3.6.1-1 +- update to 3.6.1 +- obsolete javanano subpackage; discontinued upstream + * Fri Jul 27 2018 Igor Gnatenko - 3.5.0-8 - Rebuild for new binutils diff --git a/sources b/sources index 9290519..c2af151 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ +SHA512 (protobuf-3.6.1-all.tar.gz) = 1bc175d24b49de1b1e41eaf39598194e583afffb924c86c8d2e569d935af21874be76b2cbd4d9655a1d38bac3d4cd811de88bc2c72d81bad79115e69e5b0d839 SHA512 (googlemock-1.7.0.tar.gz) = adf33728dde55d95e1c65c38a10b0578dd63a44e6beeb550dc976dc134f83a3af8096094ae2258f16cd5bebe2326f344db8981f11088bac3ffe04b384d9d2f2d SHA512 (googletest-1.7.0.tar.gz) = c623d5720c4ed574e95158529872815ecff478c03bdcee8b79c9b042a603533f93fe55f939bcfe2cd745ce340fd626ad6d9a95981596f1a4d05053d874cd1dfc -SHA512 (protobuf-3.5.0.tar.gz) = 7b9477d298f604067b9ebab72a99adae8a31249b3ea3fd0e70fd4ac77180bec83131193b2642a624fbb7cc5eae9f1b369bffec9297b49b04207ae50a4071aaa4