From da436e1a4a33cab17224a5dca41613dbc79d1785445aebbfe4eeae0d17723953 Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 2 Sep 2021 13:08:26 +0000 Subject: [PATCH 1/2] - Switch on _multibuild with the separate test step (to minimize dependencies). OBS-URL: https://build.opensuse.org/package/show/science/mpdecimal?expand=0&rev=3 --- _multibuild | 3 +++ mpdecimal.changes | 6 ++++++ mpdecimal.spec | 31 +++++++++++++++++++++++++------ 3 files changed, 34 insertions(+), 6 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..fcc7b97 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + test + diff --git a/mpdecimal.changes b/mpdecimal.changes index 67656ad..50987f0 100644 --- a/mpdecimal.changes +++ b/mpdecimal.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 2 13:07:52 UTC 2021 - Matej Cepl + +- Switch on _multibuild with the separate test step (to minimize + dependencies). + ------------------------------------------------------------------- Tue Aug 10 00:04:52 UTC 2021 - Stefan Krah diff --git a/mpdecimal.spec b/mpdecimal.spec index 187ea4f..56b5381 100644 --- a/mpdecimal.spec +++ b/mpdecimal.spec @@ -1,5 +1,5 @@ # -# spec file for package mpdecimal +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -16,7 +16,15 @@ # -Name: mpdecimal +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif +Name: mpdecimal%{psuffix} Version: 2.5.1 Release: 0 Summary: C/C++ libraries for arbitrary precision decimal floating point arithmetic @@ -29,7 +37,9 @@ BuildRequires: fdupes BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: make +%if %{with test} BuildRequires: unzip +%endif %description libmpdec is a C implementation of the General Decimal Arithmetic @@ -78,8 +88,11 @@ The package contains documentation and development headers for libmpdec and libmpdec++. %prep -%autosetup +%autosetup -p1 -n mpdecimal-%{version} + +%if %{with test} unzip -d tests/testdata %{SOURCE1} +%endif %build # NOTE: without -ffat-lto-objects the inline assembly tests in ./configure @@ -89,14 +102,19 @@ export CXXFLAGS="$CFLAGS" %configure --docdir="%{_defaultdocdir}/%{name}" %make_build -%check -%make_build check - %install +%if !%{with test} %make_install rm -f "%{buildroot}/%{_libdir}"/*.a %fdupes -s %{buildroot}/%{_docdir}/%{name} +%endif +%check +%if %{with test} +%make_build check +%endif + +%if !%{with test} %post -n libmpdec3 -p /sbin/ldconfig %post -n libmpdec++3 -p /sbin/ldconfig %postun -n libmpdec3 -p /sbin/ldconfig @@ -118,5 +136,6 @@ rm -f "%{buildroot}/%{_libdir}"/*.a %{_libdir}/libmpdec++.so %{_includedir}/mpdecimal.h %{_includedir}/decimal.hh +%endif %changelog From 5645ac6afb3ac33c1c924c9b0804e73bdb626b4d2b89a9aa38ddfce0b1b54eaa Mon Sep 17 00:00:00 2001 From: Matej Cepl Date: Thu, 2 Sep 2021 13:30:40 +0000 Subject: [PATCH 2/2] - Add a basic baselibs.conf. OBS-URL: https://build.opensuse.org/package/show/science/mpdecimal?expand=0&rev=4 --- baselibs.conf | 3 +++ mpdecimal.changes | 1 + mpdecimal.spec | 1 + 3 files changed, 5 insertions(+) create mode 100644 baselibs.conf diff --git a/baselibs.conf b/baselibs.conf new file mode 100644 index 0000000..c5023c4 --- /dev/null +++ b/baselibs.conf @@ -0,0 +1,3 @@ +libmpdec++3 +libmpdec3 +mpdecimal-devel diff --git a/mpdecimal.changes b/mpdecimal.changes index 50987f0..89c925c 100644 --- a/mpdecimal.changes +++ b/mpdecimal.changes @@ -3,6 +3,7 @@ Thu Sep 2 13:07:52 UTC 2021 - Matej Cepl - Switch on _multibuild with the separate test step (to minimize dependencies). +- Add a basic baselibs.conf. ------------------------------------------------------------------- Tue Aug 10 00:04:52 UTC 2021 - Stefan Krah diff --git a/mpdecimal.spec b/mpdecimal.spec index 56b5381..860d961 100644 --- a/mpdecimal.spec +++ b/mpdecimal.spec @@ -33,6 +33,7 @@ Group: Development/Libraries/C and C++ URL: https://www.bytereef.org/mpdecimal/index.html Source0: https://www.bytereef.org/software/mpdecimal/releases/mpdecimal-%{version}.tar.gz Source1: http://speleotrove.com/decimal/dectest.zip +Source99: baselibs.conf BuildRequires: fdupes BuildRequires: gcc BuildRequires: gcc-c++