From 7fe6a013a6fa959f0534e0cacd5a28164400ee19 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 21 2017 15:37:12 +0000 Subject: update to 0.3.4.10 subpackaging integer-logarithms --- diff --git a/.gitignore b/.gitignore index 88d0826..d5e99f6 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /scientific-0.3.3.1.tar.gz /scientific-0.3.3.8.tar.gz /scientific-0.3.4.7.tar.gz +/scientific-0.3.4.10.tar.gz diff --git a/ghc-scientific.spec b/ghc-scientific.spec index 86ca71e..640f83d 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,18 +1,22 @@ -# generated by cabal-rpm-0.9.11 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific +%global pkgver %{pkg_name}-%{version} + +%global integerlogarithms integer-logarithms-1.0.1 %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.3.4.7 -Release: 2%{?dist} -Summary: Arbitrary-precision floating-point numbers represented using scientific notation +Version: 0.3.4.10 +Release: 1%{?dist} +Summary: Numbers represented using scientific notation License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{integerlogarithms}/%{integerlogarithms}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -22,6 +26,7 @@ BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel +#BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-text-devel BuildRequires: ghc-vector-devel %if %{with tests} @@ -59,15 +64,26 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{integerlogarithms} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{integerlogarithms} %ghc_lib_build %install +%ghc_libs_install %{integerlogarithms} %ghc_lib_install @@ -92,6 +108,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Feb 21 2017 Jens Petersen - 0.3.4.10-1 +- update to 0.3.4.10 + * Fri Feb 10 2017 Fedora Release Engineering - 0.3.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 16ba94d..ba02cd5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -732705f09a9be0f745f6a313bc29a77c scientific-0.3.4.7.tar.gz +SHA512 (scientific-0.3.4.10.tar.gz) = 6d91f27e5cbf4e5e1dfd13e509b9b98ff205aa15cbe1cf28a147436e4b27d1bcecf5c174433a02b2e9f5824ed8d711a1faf39f6ed99c9c361fff590abd822338