diff --git a/ghc-scientific.spec b/ghc-scientific.spec index d529fc4..412c12f 100644 --- a/ghc-scientific.spec +++ b/ghc-scientific.spec @@ -1,33 +1,29 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name scientific %global pkgver %{pkg_name}-%{version} -%global integerlogarithms integer-logarithms-1.0.1 -%global subpkgs %{integerlogarithms} - %bcond_with tests Name: ghc-%{pkg_name} Version: 0.3.4.10 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Numbers represented using scientific notation License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} 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-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-binary-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-hashable-devel -#BuildRequires: ghc-integer-logarithms-devel +BuildRequires: ghc-integer-logarithms-devel BuildRequires: ghc-text-devel BuildRequires: ghc-vector-devel %if %{with tests} @@ -56,35 +52,27 @@ arbitrary precision numbers coming from an untrusted source. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel 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 %{pkgver} -a1 +%setup -q -n %{pkgver} %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install @@ -109,6 +97,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Nov 21 2017 Jens Petersen - 0.3.4.10-4 +- integer-logarithms is now packaged +- update to cabal-rpm-0.12 packaging + * Wed Aug 02 2017 Fedora Release Engineering - 0.3.4.10-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild