From 7fb44790f3fd879194e5d242075a274776d96e5220552edf1b3b4f1b3499b0f2 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 5 Oct 2018 10:18:13 +0000
Subject: [PATCH] - Update to new upstream release 1.3.1

OBS-URL: https://build.opensuse.org/package/show/server:monitoring/protobuf-c?expand=0&rev=19
---
 protobuf-c-1.3.0.tar.gz |  3 ---
 protobuf-c-1.3.1.tar.gz |  3 +++
 protobuf-c.changes      |  9 +++++++++
 protobuf-c.spec         | 30 ++++++++++++++----------------
 4 files changed, 26 insertions(+), 19 deletions(-)
 delete mode 100644 protobuf-c-1.3.0.tar.gz
 create mode 100644 protobuf-c-1.3.1.tar.gz

diff --git a/protobuf-c-1.3.0.tar.gz b/protobuf-c-1.3.0.tar.gz
deleted file mode 100644
index cb8c24b..0000000
--- a/protobuf-c-1.3.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5dc9ad7a9b889cf7c8ff6bf72215f1874a90260f60ad4f88acf21bb15d2752a1
-size 488443
diff --git a/protobuf-c-1.3.1.tar.gz b/protobuf-c-1.3.1.tar.gz
new file mode 100644
index 0000000..02c8e26
--- /dev/null
+++ b/protobuf-c-1.3.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:51472d3a191d6d7b425e32b612e477c06f73fe23e07f6a6a839b11808e9d2267
+size 498779
diff --git a/protobuf-c.changes b/protobuf-c.changes
index 977b92d..0d6e254 100644
--- a/protobuf-c.changes
+++ b/protobuf-c.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Oct  5 10:14:36 UTC 2018 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to new upstream release 1.3.1
+  * Restore protobuf-2.x compatibility
+  * Convert uses of protobuf's scoped_ptr.h to C++11 std::unique_ptr,
+    needed to compile against protobuf 3.6.1.
+- Rename %soname to %sover to better reflect its use.
+
 -------------------------------------------------------------------
 Fri Dec 22 14:29:07 UTC 2017 - jengelh@inai.de
 
diff --git a/protobuf-c.spec b/protobuf-c.spec
index 5f6dd3b..409dc0b 100644
--- a/protobuf-c.spec
+++ b/protobuf-c.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package protobuf-c
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2011 Pascal Bleser
 #
 # All modifications and additions to the file contributed by third parties
@@ -13,18 +13,18 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 Name:           protobuf-c
-Version:        1.3.0
+Version:        1.3.1
 Release:        0
-%define soname 1
+%define sover 1
 Summary:        C bindings for Google's Protocol Buffers
 License:        BSD-3-Clause
 Group:          Development/Tools/Other
-Source:         https://github.com/%{name}/%{name}/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
 Url:            https://github.com/protobuf-c/protobuf-c
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -44,20 +44,18 @@ Buffers from pure C (not C++).
 
 It uses a modified version of protoc called protoc-c.
 
-%package -n libprotobuf-c%{soname}
-
+%package -n libprotobuf-c%{sover}
 Summary:        C bindings for Google's Protocol Buffers
 Group:          System/Libraries
 
-%description -n libprotobuf-c%{soname}
+%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%{soname} = %{version}
+Requires:       libprotobuf-c%{sover} = %{version}
 
 %description -n libprotobuf-c-devel
 This package provides a code generator and runtime libraries to use Protocol
@@ -89,7 +87,7 @@ make %{?_smp_flags}
 %install
 %if 0
 pushd build
-%makeinstall
+%make_install
 popd #build
 %else
 %make_install
@@ -97,8 +95,8 @@ popd #build
 rm "%{buildroot}/%{_libdir}"/*.a
 rm "%{buildroot}/%{_libdir}"/*.la
 
-%post   -n libprotobuf-c%{soname} -p /sbin/ldconfig
-%postun -n libprotobuf-c%{soname} -p /sbin/ldconfig
+%post   -n libprotobuf-c%{sover} -p /sbin/ldconfig
+%postun -n libprotobuf-c%{sover} -p /sbin/ldconfig
 
 %files
 %defattr(-,root,root)
@@ -106,11 +104,11 @@ rm "%{buildroot}/%{_libdir}"/*.la
 %{_bindir}/protoc-c
 %{_bindir}/protoc-gen-c
 
-%files -n libprotobuf-c%{soname}
+%files -n libprotobuf-c%{sover}
 %defattr(-,root,root)
 %doc LICENSE
-%{_libdir}/libprotobuf-c.so.%{soname}
-%{_libdir}/libprotobuf-c.so.%{soname}.*
+%{_libdir}/libprotobuf-c.so.%{sover}
+%{_libdir}/libprotobuf-c.so.%{sover}.*
 
 %files -n libprotobuf-c-devel
 %defattr(-,root,root)