diff --git a/arprec-2.2.18-fix_gcc6.patch b/arprec-2.2.18-fix_gcc6.patch deleted file mode 100644 index 713d284..0000000 --- a/arprec-2.2.18-fix_gcc6.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: arprec-2.2.18/src/write.cpp -=================================================================== ---- arprec-2.2.18.orig/src/write.cpp -+++ arprec-2.2.18/src/write.cpp -@@ -196,6 +196,6 @@ bool mp_real::write(ostream &s, int prec - - string str = to_string(precision, width, expn_width, - fmt, showpos, uppercase, fill); -- return (s << str) != 0; -+ return static_cast(s << str) != 0; - } - diff --git a/arprec.spec b/arprec.spec index ec2dfcc..d92e1fc 100644 --- a/arprec.spec +++ b/arprec.spec @@ -11,26 +11,21 @@ # Setup _pkgdocdir if not defined already. %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}} -Name: arprec -Version: 2.2.18 -Release: 5%{?dist} -Summary: Software package for performing arbitrary precision arithmetic -%{?el5:Group: System Environment/Libraries} - -License: BSD -URL: http://crd.lbl.gov/~dhbailey/mpdist -Source0: %{url}/%{name}-%{version}.tar.gz -Source1: %{url}/BSD-LBNL-License.doc - -# fixes for GCC 6 -Patch0001: arprec-2.2.18-fix_gcc6.patch - -%{?el5:BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)} -BuildRequires: catdoc -BuildRequires: chrpath -BuildRequires: gcc-gfortran -BuildRequires: libtool -BuildRequires: qd-devel +Name: arprec +Version: 2.2.19 +Release: 1%{?dist} +Summary: Software package for performing arbitrary precision arithmetic + +License: BSD +URL: http://crd.lbl.gov/~dhbailey/mpdist +Source0: %{url}/%{name}-%{version}.tar.gz +Source1: %{url}/BSD-LBNL-License.doc + +BuildRequires: catdoc +BuildRequires: chrpath +BuildRequires: gcc-gfortran +BuildRequires: libtool +BuildRequires: qd-devel %description ARPREC is a software package for performing arbitrary precision @@ -72,42 +67,37 @@ techniques. Features include: %package data -Summary: Data files for %{name}-tools -%{?el5:Group: Applications/Engineering} +Summary: Data files for %{name}-tools -%{?!el5:BuildArch: noarch} +BuildArch: noarch %description data This package contains data-files used with %{name}-tools. %package devel -Summary: Development files for %{name} -%{?el5:Group: Development/Libraries} +Summary: Development files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} -%{?el5:Requires: pkgconfig} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package contains the development files and headers for %{name}. %package doc -Summary: Documentation files for %{name} -%{?el5:Group: Documentation} +Summary: Documentation files for %{name} -%{?!el5:BuildArch: noarch} +BuildArch: noarch %description doc This package contains the documentation and some brief examples. %package tools -Summary: Interactive high-precision arithmetic computing environment -%{?el5:Group: Applications/Engineering} +Summary: Interactive high-precision arithmetic computing environment -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-data = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name}-data = %{version}-%{release} %description tools This is a complete interactive high-precision arithmetic computing @@ -123,10 +113,9 @@ series. %prep -%setup -q +%autosetup -cp 1 -# Apply patches. -%patch0001 -p 1 -b .gcc6 +pushd %{name} # Pull-in upstream's .doc-license. %{__cp} -a %{SOURCE1} . @@ -263,8 +252,12 @@ Libs: @libs@ Cflags: -I\${includedir} EOF +popd + %build +pushd %{name} + # Remove obsoleted autotools-macros from configure.ac for el6+. Running # `autoupdate` and `autoreconf -fiv` is the recommended procedure to do so. # For further reference have a look at libtool's manual on gnu.org: @@ -273,17 +266,16 @@ EOF # During the el5-build we need to correct some timestamps, because they are # broken in upstream's pristine tarballs. This is not needed for el6+, # because this will be taken care of by `autoupdate` and `autoreconf -fiv`. -%{?el5:/bin/touch -r aclocal.m4 configure configure.ac} -%{?!el5:%{_bindir}/autoupdate} -%{?!el5:%{_bindir}/autoreconf -fiv} +%{_bindir}/autoupdate +%{_bindir}/autoreconf -fiv # Invoke the `regular` build-procedure. %configure \ --disable-static \ -%{?!el5:--enable-qd} \ + --enable-qd \ --enable-shared -%{__make} %{?_smp_mflags} -%{__make} %{?_smp_mflags} toolkit +%make_build +%make_build toolkit # Substitute @var@ in .pc-template from %%prep %{__chmod} +x %{name}-config @@ -318,10 +310,13 @@ pushd toolkit %endif # %%{with mathinit} popd +popd + %install -%{?el5:%{__rm} -rf %{buildroot}} -%{__make} install DESTDIR=%{buildroot} +pushd %{name} + +%make_install # Remove unneeded and obsolete stuff. %%{name}-config will be replaced by the # new wrapper later. The pre-installed docs will be picked as %%doc within @@ -354,7 +349,7 @@ done # Install documentation and license. %{__mkdir} -p %{buildroot}%{_pkgdocdir}/{examples,toolkit} %{__install} -pm 0644 AUTHORS* BSD-LBNL-License* ChangeLog* \ - COPYING* NEWS* README* TODO* doc/* \ + COPYING* NEWS* README* doc/* \ %{buildroot}%{_pkgdocdir} %{__install} -pm 0644 examples/* %{buildroot}%{_pkgdocdir}/examples %{__install} -pm 0644 toolkit/README* %{buildroot}%{_pkgdocdir}/toolkit @@ -362,6 +357,8 @@ done %{__rm} -rf BSD-LBNL-License* COPYING* %endif # %%{with license} +popd + %check # On Fedora the IO-read test failes for some unknown reason. On RHEL all @@ -371,11 +368,7 @@ done # that one test. Let me know if you have any problems in running your codes # -- I don't think you will. # DHB -%{__make} check ||: - - -%{?el5:%clean} -%{?el5:%{__rm} -rf %{buildroot}} +%make_build -C %{name} check ||: %post -p /sbin/ldconfig @@ -384,7 +377,7 @@ done %files %if %{with license} -%license BSD-LBNL-License* COPYING* +%license %{name}/BSD-LBNL-License* %{name}/COPYING* %else # %%{with license} %doc %dir %{_pkgdocdir} %doc %{_pkgdocdir}/BSD-LBNL-License* @@ -392,6 +385,7 @@ done %endif # %%{with license} %{_libdir}/lib%{name}*.so.* + %files data %if %{with license} %license %{_datadir}/licenses/%{name} @@ -402,18 +396,21 @@ done %endif # %%{with license} %{_datadir}/%{name} + %files devel %{_bindir}/%{name}-config %{_includedir}/* %{_libdir}/lib%{name}*.so %{_libdir}/pkgconfig/%{name}.pc + %files doc %if %{with license} %license %{_datadir}/licenses/%{name} %endif # %%{with license} %doc %{_pkgdocdir} + %files tools %doc %dir %{_pkgdocdir} %doc %{_pkgdocdir}/toolkit @@ -421,6 +418,9 @@ done %changelog +* Tue Jul 18 2017 Björn Esser - 2.2.19-1 +- New upstream release (rhbz#1472013) + * Fri Feb 10 2017 Fedora Release Engineering - 2.2.18-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index c247f03..366a6ba 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -d589a2c04768d2821fb1ad56c1b796f3 arprec-2.2.18.tar.gz -8f2ac823c57a908d278356f439f91e80 BSD-LBNL-License.doc +SHA512 (arprec-2.2.19.tar.gz) = 97cf090398aa169e31711077efd26dc6da1f62291ab37b241b133634838bdd44743f85b86b861a3be18d2696ae9132afb6cd1871502bedb9cc17dfb63fde2632 +SHA512 (BSD-LBNL-License.doc) = 5db2d242c249ccd6ed4e7fc59a6ebba7c83274b1cf330d0d12e97da32ea0da9b9b0b0c1f51c58f809658ea92f7afbf5d3a1c75d899f94ec38a0d91926608cf85