From 708cdb2927e9179bfac51f45e3eecad1a8f5e722d2e328a23cf1d7ab49be5ead Mon Sep 17 00:00:00 2001 From: Richard Biener Date: Mon, 12 Apr 2021 07:38:34 +0000 Subject: [PATCH] Accepting request 884220 from home:AndreasStieger:branches:devel:libraries:c_c++ - do not break SLE 12 build when applying spec-cleaner OBS-URL: https://build.opensuse.org/request/show/884220 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/gmp?expand=0&rev=88 --- gmp.changes | 5 +++++ gmp.spec | 20 +++++++++++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/gmp.changes b/gmp.changes index 18bae67..8a9d404 100644 --- a/gmp.changes +++ b/gmp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 10 12:05:09 UTC 2021 - Andreas Stieger + +- do not break SLE 12 build when applying spec-cleaner + ------------------------------------------------------------------- Wed Dec 9 07:24:19 UTC 2020 - Richard Biener diff --git a/gmp.spec b/gmp.spec index 63e940d..e694eaa 100644 --- a/gmp.spec +++ b/gmp.spec @@ -1,7 +1,7 @@ # # spec file for package gmp # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,12 @@ # +%{!?make_build: %define make_build make %{?_smp_mflags}} Name: gmp Version: 6.2.1 Release: 0 Summary: A library for calculating huge numbers -License: GPL-3.0-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later) +License: (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later Group: Development/Libraries/C and C++ URL: https://gmplib.org/ Source0: https://gmplib.org/download/%{name}/%{name}-%{version}.tar.xz @@ -41,7 +42,7 @@ available memory in the machine GMP runs on. %package -n libgmp10 Summary: A library for calculating huge numbers -License: LGPL-3.0-or-later OR GPL-2.0-or-later +License: GPL-2.0-or-later OR LGPL-3.0-or-later Group: System/Libraries %description -n libgmp10 @@ -50,7 +51,7 @@ signed integers, rational numbers, and floating-point numbers. %package -n libgmpxx4 Summary: C++ bindings for the GNU MP Library -License: LGPL-3.0-or-later OR GPL-2.0-or-later +License: GPL-2.0-or-later OR LGPL-3.0-or-later Group: System/Libraries Requires: libgmp10 >= %{version} @@ -62,12 +63,12 @@ This package contains C++ bindings for the GNU MP Library. %package devel Summary: Include Files and Libraries for Development with the GNU MP Library -License: GPL-3.0-or-later AND (LGPL-3.0-or-later OR GPL-2.0-or-later) +License: (GPL-2.0-or-later OR LGPL-3.0-or-later) AND GPL-3.0-or-later Group: Development/Languages/C and C++ Requires: libgmp10 = %{version} Requires: libgmpxx4 = %{version} Requires(pre): %{install_info_prereq} -Requires(preun): %{install_info_prereq} +Requires(preun):%{install_info_prereq} %description devel These libraries are needed to develop programs which calculate with @@ -75,7 +76,7 @@ huge numbers (integer and floating point). %prep %setup -q -%patch1 -p0 +%patch1 %build export CFLAGS="%{optflags} -fexceptions" @@ -83,11 +84,11 @@ export CFLAGS="%{optflags} -fexceptions" --disable-static \ --enable-cxx \ --enable-fat -make %{?_smp_mflags} +%make_build %check # do not disable "make check", FIX THE BUGS! -make %{?_smp_mflags} check +%make_build check %install %make_install @@ -98,6 +99,7 @@ rm %{buildroot}%{_libdir}/libgmpxx.la %post -n libgmpxx4 -p /sbin/ldconfig %postun -n libgmp10 -p /sbin/ldconfig %postun -n libgmpxx4 -p /sbin/ldconfig + %post devel %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info%{ext_info}