1
0
forked from pool/protobuf-c

Accepting request 725957 from server:monitoring

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/725957
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/protobuf-c?expand=0&rev=16
This commit is contained in:
Dominique Leuenberger 2019-08-27 13:25:54 +00:00 committed by Git OBS Bridge
commit 274a3b2b27
5 changed files with 30 additions and 74 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267
size 498779

3
protobuf-c-1.3.2.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:53f251f14c597bdb087aecf0b63630f434d73f5a10fc1ac545073597535b9e74
size 500100

View File

@ -1,23 +0,0 @@
From 080724364a5aad61728f8eba57677467bf329088 Mon Sep 17 00:00:00 2001
From: storyun <joowoni91@gmail.com>
Date: Wed, 19 Sep 2018 11:34:48 +0900
Subject: [PATCH] Invalid namespace
google::protobuf::message::Reflaction is not exist namespace.
---
t/generated-code2/cxx-generate-packed-data.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/generated-code2/cxx-generate-packed-data.cc b/t/generated-code2/cxx-generate-packed-data.cc
index 4fd3e25..0865d2e 100644
--- a/t/generated-code2/cxx-generate-packed-data.cc
+++ b/t/generated-code2/cxx-generate-packed-data.cc
@@ -998,7 +998,7 @@ static void dump_test_packed_repeated_enum (void)
static void dump_test_unknown_fields (void)
{
EmptyMess mess;
- const google::protobuf::Message::Reflection *reflection = mess.GetReflection();
+ const google::protobuf::Reflection *reflection = mess.GetReflection();
google::protobuf::UnknownFieldSet *fs = reflection->MutableUnknownFields(&mess);
#if GOOGLE_PROTOBUF_VERSION >= 2001000

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Aug 18 16:36:38 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- Update to new upstream release 1.3.2
* Fix proto3 repeated scalar field default packing behavior
* Fix out-of-bounds read in scan_length_prefixed_data()
- Remove protobuf-c-namespace.patch (merged)
-------------------------------------------------------------------
Fri Jun 7 13:45:12 UTC 2019 - Martin Pluskal <mpluskal@suse.com>

View File

@ -19,15 +19,14 @@
%define sover 1
Name: protobuf-c
Version: 1.3.1
Version: 1.3.2
Release: 0
Summary: C bindings for Google's Protocol Buffers
License: BSD-3-Clause
Group: Development/Tools/Other
URL: https://github.com/protobuf-c/protobuf-c
Source: https://github.com/protobuf-c/protobuf-c/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source: https://github.com/protobuf-c/protobuf-c/releases/download/v%version/%name-%version.tar.gz
Source99: protobuf-c-rpmlintrc
Patch0: protobuf-c-namespace.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc
@ -36,7 +35,7 @@ BuildRequires: libtool
BuildRequires: make
BuildRequires: pkgconfig
BuildRequires: protobuf-devel >= 2.6.0
Requires: libprotobuf-c-devel = %{version}
Requires: libprotobuf-c-devel = %version
%description
This package provides a code generator and runtime libraries to use Protocol
@ -44,80 +43,52 @@ Buffers from pure C (not C++).
It uses a modified version of protoc called protoc-c.
%package -n libprotobuf-c%{sover}
%package -n libprotobuf-c%sover
Summary: C bindings for Google's Protocol Buffers
Group: System/Libraries
%description -n libprotobuf-c%{sover}
%description -n libprotobuf-c%sover
This package provides a code generator and runtime libraries to use Protocol
Buffers from pure C (not C++).
%package -n libprotobuf-c-devel
Summary: C bindings for Google's Protocol Buffers
Group: Development/Libraries/C and C++
Requires: libprotobuf-c%{sover} = %{version}
Requires: libprotobuf-c%sover = %version
%description -n libprotobuf-c-devel
This package provides a code generator and runtime libraries to use Protocol
Buffers from pure C (not C++).
%prep
%setup -q
%patch0 -p1
%autosetup -p1
%build
%define _lto_cflags %{nil}
%if 0
mkdir build
pushd build
export CFLAGS="%{optflags}"
cmake \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
-DCMAKE_INSTALL_PREFIX:PATH="%{_prefix}" \
-DCMAKE_SKIP_RPATH=TRUE \
-DCMAKE_BUILD_WITH_INSTALL_RPATH=FALSE \
-DCMAKE_STRIP="%{_bindir}/touch" \
..
make %{?_smp_mflags}
popd #build
%else
%define _lto_cflags %nil
autoreconf -fvi
%configure
make %{?_smp_mflags}
%endif
%install
%if 0
pushd build
%make_install
popd #build
%else
%make_install
%endif
rm "%{buildroot}/%{_libdir}"/*.a
rm "%{buildroot}/%{_libdir}"/*.la
rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la
%post -n libprotobuf-c%{sover} -p /sbin/ldconfig
%postun -n libprotobuf-c%{sover} -p /sbin/ldconfig
%post -n libprotobuf-c%sover -p /sbin/ldconfig
%postun -n libprotobuf-c%sover -p /sbin/ldconfig
%files
%defattr(-,root,root)
%doc ChangeLog TODO
%{_bindir}/protoc-c
%{_bindir}/protoc-gen-c
%_bindir/protoc-c
%_bindir/protoc-gen-c
%files -n libprotobuf-c%{sover}
%defattr(-,root,root)
%files -n libprotobuf-c%sover
%license LICENSE
%{_libdir}/libprotobuf-c.so.%{sover}
%{_libdir}/libprotobuf-c.so.%{sover}.*
%_libdir/libprotobuf-c.so.%sover
%_libdir/libprotobuf-c.so.%sover.*
%files -n libprotobuf-c-devel
%defattr(-,root,root)
%dir %{_includedir}/google
%{_includedir}/google/protobuf-c
%{_includedir}/protobuf-c/
%{_libdir}/libprotobuf-c.so
%{_libdir}/pkgconfig/libprotobuf-c.pc
%_includedir/*/
%_libdir/libprotobuf-c.so
%_libdir/pkgconfig/libprotobuf-c.pc
%changelog