From d12b91c15c01e02f07516fcd6f31eb974967eb4d1bb05193da6d803b02c4928a Mon Sep 17 00:00:00 2001 From: Timo Jyrinki Date: Wed, 9 Aug 2023 07:37:31 +0000 Subject: [PATCH] Accepting request 1103054 from LibreOffice:Factory fix sle12sp5 OBS-URL: https://build.opensuse.org/request/show/1103054 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libvoikko?expand=0&rev=46 --- libvoikko.changes | 5 +++++ libvoikko.spec | 13 ++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/libvoikko.changes b/libvoikko.changes index d26576f..662ef26 100644 --- a/libvoikko.changes +++ b/libvoikko.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 7 20:05:10 UTC 2023 - Fridrich Strba + +- Fix build on older distributions by requiring gcc/g++ >= 7 + ------------------------------------------------------------------- Sat Jul 1 21:19:00 UTC 2023 - Dirk Müller diff --git a/libvoikko.spec b/libvoikko.spec index ee5ae2f..263acfd 100644 --- a/libvoikko.spec +++ b/libvoikko.spec @@ -16,6 +16,7 @@ # +%{!?make_build:%global make_build make %{?_smp_mflags}} Name: libvoikko Version: 4.3.2 Release: 0 @@ -27,11 +28,17 @@ Source0: https://www.puimula.org/voikko-sources/%{name}/%{name}-%{version Source1: https://www.puimula.org/voikko-sources/%{name}/%{name}-%{version}.tar.gz.asc Source2: %{name}.keyring Source99: baselibs.conf -BuildRequires: gcc-c++ BuildRequires: glib2-devel BuildRequires: pkgconfig BuildRequires: python3-xml BuildRequires: pkgconfig(hfstospell) >= 0.5 +%if 0%{?suse_version} < 1500 +BuildRequires: gcc7 +BuildRequires: gcc7-c++ +%else +BuildRequires: gcc >= 7 +BuildRequires: gcc-c++ >= 7 +%endif %description Libvoikko is a library of free natural language processing tools. It @@ -118,6 +125,10 @@ can be used to perform various natural language analysis tasks on text. %setup -q %build +%if 0%{?suse_version} < 1500 +export CC="gcc-7" +export CXX="g++-7" +%endif %configure \ --disable-silent_rules \ --disable-static \