From 6160fdd18dc0f3b53e3b4b6e79da07b6618e598949a013b0065df38065bb8ac7 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 17 Mar 2022 09:44:21 +0000 Subject: [PATCH] Accepting request 962367 from home:dziobian - Change Requires: zlib-devel to pkgconfig(zlib) so as not to conflict with libz-ng-compat1. (I was certain i made a changes entry this time) OBS-URL: https://build.opensuse.org/request/show/962367 OBS-URL: https://build.opensuse.org/package/show/devel:tools:building/protobuf?expand=0&rev=112 --- protobuf.changes | 5 +++++ protobuf.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/protobuf.changes b/protobuf.changes index 305241e..736f7e7 100644 --- a/protobuf.changes +++ b/protobuf.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Mar 16 16:39:10 UTC 2022 - Bruno Pitrus + +- Change Requires: zlib-devel to pkgconfig(zlib) so as not to conflict with libz-ng-compat1. + ------------------------------------------------------------------- Fri Jan 28 20:38:41 UTC 2022 - Dirk Müller diff --git a/protobuf.spec b/protobuf.spec index bd77749..4f2fb6b 100644 --- a/protobuf.spec +++ b/protobuf.spec @@ -103,7 +103,7 @@ Group: Development/Libraries/C and C++ Requires: gcc-c++ Requires: libprotobuf%{sover} = %{version} Requires: libprotobuf-lite%{sover} -Requires: zlib-devel +Requires: pkgconfig(zlib) Conflicts: protobuf2-devel Provides: libprotobuf-devel = %{version}