Update protobuf-c to version 1.4.0 / rev 21

https://build.opensuse.org/package/rdiff/openSUSE:Factory/protobuf-c?linkrev=base&rev=21 by user RBrownFactory Revert to rev 19, protocolbuffers/protobuf#10323
bmwiedemann · Jul 27, 2022 · dd45164 · dd45164
1 parent 06ad68d
commit dd45164
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 110 deletions.
diff --git a/packages/p/protobuf-c/.files b/packages/p/protobuf-c/.files
diff --git a/packages/p/protobuf-c/.rev b/packages/p/protobuf-c/.rev
@@ -152,4 +152,11 @@
     <comment></comment>
     <requestid>986912</requestid>
   </revision>
+  <revision rev="21" vrev="4">
+    <srcmd5>5e2914bcc15e5f45a33a577a7a0b53f6</srcmd5>
+    <version>1.4.0</version>
+    <time>1658951219</time>
+    <user>RBrownFactory</user>
+    <comment>Revert to rev 19, https://github.com/protocolbuffers/protobuf/issues/10323</comment>
+  </revision>
 </revisionlist>
diff --git a/packages/p/protobuf-c/.servicemark b/packages/p/protobuf-c/.servicemark
@@ -0,0 +1 @@
+af206b64c264d24c57cb01e60575fd7f
diff --git a/packages/p/protobuf-c/508.patch b/packages/p/protobuf-c/508.patch
diff --git a/packages/p/protobuf-c/protobuf-c.changes b/packages/p/protobuf-c/protobuf-c.changes
@@ -1,12 +1,3 @@
--------------------------------------------------------------------
-Tue Jul  5 12:38:17 UTC 2022 - Adam Majer <[email protected]>
-
-- Do not build static libraries
-- Run unit tests
-- Explicit files and directories for includedir, so we can detect
-  what we actually install there
-- 508.patch: fixes invalid arithmetic shift (bsc#1200908, CVE-2022-33070)
-
 -------------------------------------------------------------------
 Tue Nov 23 10:10:53 UTC 2021 - Bjørn Lie <[email protected]>
 

diff --git a/packages/p/protobuf-c/protobuf-c.spec b/packages/p/protobuf-c/protobuf-c.spec
@@ -26,7 +26,6 @@ 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
-Patch1:         508.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  gcc
@@ -55,7 +54,7 @@ Summary:        C bindings for Google's Protocol Buffers
 Group:          Development/Libraries/C and C++
 Requires:       libprotobuf-c%sover = %version
 Provides:       %name = %version
-Obsoletes:      %name <= 1.4.0
+Obsoletes:      %name <= %version
 
 %description -n libprotobuf-c-devel
 This package provides a code generator and runtime libraries to use Protocol
@@ -65,20 +64,14 @@ Buffers from pure C (not C++).
 %autosetup -p1
 
 %build
-%{!?make_build:%define make_build make -O %{?_smp_mflags} V=1 VERBOSE=1}
 %define _lto_cflags %nil
 autoreconf -fvi
-%configure \
-    --enable-static=no
-
+%configure
 %make_build
 
 %install
 %make_install
-rm %buildroot/%_libdir/*.la
-
-%check
-make check
+rm "%buildroot/%_libdir"/*.a "%buildroot/%_libdir"/*.la
 
 %post   -n libprotobuf-c%sover -p /sbin/ldconfig
 %postun -n libprotobuf-c%sover -p /sbin/ldconfig
@@ -90,13 +83,9 @@ make check
 
 %files -n libprotobuf-c-devel
 %doc ChangeLog TODO
-%dir %_includedir/protobuf-c
-%dir %_includedir/google
-%dir %_includedir/google/protobuf-c
-%_includedir/protobuf-c/*
-%_includedir/google/protobuf-c/protobuf-c.h
 %_bindir/protoc-c
 %_bindir/protoc-gen-c
+%_includedir/*/
 %_libdir/libprotobuf-c.so
 %_libdir/pkgconfig/libprotobuf-c.pc