From 084ba90ff23ea2c59e653bd9752fe345f26d407ba62e483a4a3e3d8fb48c67fb Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Tue, 13 Jun 2023 16:04:12 +0000 Subject: [PATCH] - prefer protobuf 21 as it is not compatible with v22 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libphonenumber?expand=0&rev=13 --- libphonenumber.changes | 5 +++++ libphonenumber.spec | 7 ++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libphonenumber.changes b/libphonenumber.changes index 7d38213..48eeab1 100644 --- a/libphonenumber.changes +++ b/libphonenumber.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jun 13 16:03:57 UTC 2023 - Dirk Müller + +- prefer protobuf 21 as it is not compatible with v22 + ------------------------------------------------------------------- Thu May 20 16:16:04 UTC 2021 - Andreas Stieger diff --git a/libphonenumber.spec b/libphonenumber.spec index eb9cd4c..9a4b94b 100644 --- a/libphonenumber.spec +++ b/libphonenumber.spec @@ -1,7 +1,7 @@ # # spec file for package libphonenumber # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,8 @@ BuildRequires: libboost_thread-devel BuildRequires: pkgconfig(gtest) BuildRequires: pkgconfig(icu-i18n) >= 4.4 BuildRequires: pkgconfig(icu-uc) >= 4.4 -BuildRequires: pkgconfig(protobuf) >= 2.4 +# not compatible with v22 due to https://protobuf.dev/news/2022-08-03/#cpp-changes +BuildRequires: (pkgconfig(protobuf) >= 2.4 with pkgconfig(protobuf) < 22) %description Google's common Java, C++ and JavaScript library for parsing, formatting, @@ -55,7 +56,7 @@ for running on smartphones, and is used by the Android framework since 4.0 Summary: Library for parsing, formatting, and validating international phone numbers Group: Development/Libraries/C and C++ Requires: %{name}%{lib_ver} = %{version} -Requires: pkgconfig(protobuf) >= 2.4 +Requires: (pkgconfig(protobuf) >= 2.4 with pkgconfig(protobuf) < 22) %description devel Google's common Java, C++ and JavaScript library for parsing, formatting,