packages/protobuf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!9 upgrade from v3.9.0 to v3.12.3

Browse Source 
Merge pull request !9 from Zhangxiaoyu/master
This commit is contained in:
openeuler-ci-bot 2020-07-16 19:56:11 +08:00 committed by Gitee
commit 738f12f865
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
0001-add-secure-compile-option-in-Makefile.patch
View File

@ -1,11 +1,11 @@
diff --git a/src/Makefile.am b/src/Makefile.am diff --git a/src/Makefile.am b/src/Makefile.am
index f869d56..c8170f2 100644 index f1099d9..9b7053b 100644
--- a/src/Makefile.am --- a/src/Makefile.am
+++ b/src/Makefile.am +++ b/src/Makefile.am
@@ -19,6 +19,7 @@ PTHREAD_DEF = @@ -19,6 +19,7 @@ PTHREAD_DEF =
endif endif
PROTOBUF_VERSION = 20:0:0 PROTOBUF_VERSION = 23:3:0
+PROTOBUF_OPT_FLAG += -Wl,-z,now +PROTOBUF_OPT_FLAG += -Wl,-z,now
if GCC if GCC

BIN
protobuf-all-3.12.3.tar.gz Normal file
View File

Binary file not shown.

BIN
protobuf-all-3.9.0.tar.gz
View File

Binary file not shown.

30
protobuf.spec
View File

@ -8,8 +8,8 @@
Summary: Protocol Buffers - Google's data interchange format Summary: Protocol Buffers - Google's data interchange format
Name: protobuf Name: protobuf
Version: 3.9.0 Version: 3.12.3
Release: 9 Release: 10
License: BSD License: BSD
URL: https://github.com/protocolbuffers/protobuf URL: https://github.com/protocolbuffers/protobuf
Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz Source: https://github.com/protocolbuffers/protobuf/releases/download/v%{version}%{?rcver}/%{name}-all-%{version}%{?rcver}.tar.gz
@ -22,9 +22,9 @@ Requires: emacs-filesystem >= %{_emacs_version} vim-enhanced
Provides: %{name}-vim Provides: %{name}-vim
Provides: %{name}-emacs Provides: %{name}-emacs
Provides: %{name}-emacs-el Provides: %{name}-emacs-el
Obsoletes: %{name}-vim < 3.9.0 Obsoletes: %{name}-vim < 3.12.3
Obsoletes: %{name}-emacs < 3.9.0 Obsoletes: %{name}-emacs < 3.12.3
Obsoletes: %{name}-emacs-el < 3.9.0 Obsoletes: %{name}-emacs-el < 3.12.3
%description %description
@ -38,8 +38,8 @@ Requires: %{name} = %{version}-%{release}
Requires: zlib-devel pkgconfig Requires: zlib-devel pkgconfig
Provides: %{name}-compiler Provides: %{name}-compiler
Provides: %{name}-static Provides: %{name}-static
Obsoletes: %{name}-compiler < 3.9.0 Obsoletes: %{name}-compiler < 3.12.3
Obsoletes: %{name}-static < 3.9.0 Obsoletes: %{name}-static < 3.12.3
%description devel %description devel
This package contains Protocol Buffers compiler for all languages and This package contains Protocol Buffers compiler for all languages and
@ -60,7 +60,7 @@ Summary: Protocol Buffers LITE_RUNTIME development libraries
Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release}
Requires: %{name}-lite = %{version}-%{release} Requires: %{name}-lite = %{version}-%{release}
Provides: %{name}-lite-static Provides: %{name}-lite-static
Obsoletes: %{name}-lite-static < 3.9.0 Obsoletes: %{name}-lite-static < 3.12.3
%description lite-devel %description lite-devel
This package contains development libraries built with This package contains development libraries built with
@ -240,11 +240,11 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
%files %files
%doc CHANGES.txt CONTRIBUTORS.txt README.md %doc CHANGES.txt CONTRIBUTORS.txt README.md
%license LICENSE %license LICENSE
%{_libdir}/libprotobuf.so.20* %{_libdir}/libprotobuf.so.23*
%doc README.md %doc README.md
%license LICENSE %license LICENSE
%{_bindir}/protoc %{_bindir}/protoc
%{_libdir}/libprotoc.so.20* %{_libdir}/libprotoc.so.23*
%{_emacs_sitelispdir}/%{name}/ %{_emacs_sitelispdir}/%{name}/
%{_emacs_sitestartdir}/protobuf-init.el %{_emacs_sitestartdir}/protobuf-init.el
@ -259,7 +259,7 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
%{_libdir}/libprotoc.a %{_libdir}/libprotoc.a
%files lite %files lite
%{_libdir}/libprotobuf-lite.so.20* %{_libdir}/libprotobuf-lite.so.23*
%files lite-devel %files lite-devel
%{_libdir}/libprotobuf-lite.so %{_libdir}/libprotobuf-lite.so
@ -302,7 +302,13 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_emacs_sitestartdir}
%endif %endif
%changelog %changelog
* Web Apr 08 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.9.0-9 * Thu Jul 16 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.12.3-10
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:upgrade from 3.9.0 to 3.12.3
* Wed Apr 08 2020 openEuler Buildteam <buildteam@openeuler.org> - 3.9.0-9
- Type:enhancement - Type:enhancement
- ID:NA - ID:NA
- SUG:NA - SUG:NA