From eae932d30ba18cac6f5c498f23f450a05647a47c72a9096ddb6c6625b40a9809 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 25 Apr 2023 09:05:31 +0000 Subject: [PATCH] Accepting request 1082699 from home:fcrozat:branches:devel:libraries:c_c++ - Drop support for building on SLE12. OBS-URL: https://build.opensuse.org/request/show/1082699 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/zxing-cpp?expand=0&rev=29 --- zxing-cpp.changes | 5 +++++ zxing-cpp.spec | 12 +----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/zxing-cpp.changes b/zxing-cpp.changes index c69b21f..f426ead 100644 --- a/zxing-cpp.changes +++ b/zxing-cpp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Apr 25 08:56:24 UTC 2023 - Frederic Crozat + +- Drop support for building on SLE12. + ------------------------------------------------------------------- Wed Jan 25 14:01:00 UTC 2023 - Bjørn Lie diff --git a/zxing-cpp.spec b/zxing-cpp.spec index 925d817..b21d524 100644 --- a/zxing-cpp.spec +++ b/zxing-cpp.spec @@ -27,15 +27,9 @@ URL: https://github.com/nu-book/zxing-cpp/ Source0: %{url}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source99: baselibs.conf -BuildRequires: pkgconfig -# Use cmake3 package on SLE12 because cmake is too old (version 3.5) -%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 -BuildRequires: cmake3-full >= 3.10 -BuildRequires: gcc11-c++ -%else BuildRequires: cmake >= 3.10 BuildRequires: gcc-c++ -%endif +BuildRequires: pkgconfig # only TW has fmt %if 0%{?suse_version} > 1500 # For blackbox tests @@ -71,14 +65,10 @@ other applications. %autosetup -p1 %build -# Use g++-11 to build a C++17 codebase # Examples require QT5-base/multimedia, but doing so creates a cycle # Blackbox tests require fmt %cmake \ -DBUILD_EXAMPLES=OFF \ -%if !0%{?is_opensuse} && 0%{?sle_version} < 150000 - -DCMAKE_CXX_COMPILER=/usr/bin/g++-11 \ -%endif %if 0%{?suse_version} < 1550 -DBUILD_BLACKBOX_TESTS=OFF %endif