diff --git a/.gitignore b/.gitignore index c27a829..74f3759 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ HUnit-1.2.2.1.tar.gz /HUnit-1.2.5.2.tar.gz /HUnit-1.3.0.0.tar.gz /HUnit-1.3.1.1.tar.gz +/HUnit-1.5.0.0.tar.gz diff --git a/ghc-HUnit.spec b/ghc-HUnit.spec index 4ac5498..5e8ecda 100644 --- a/ghc-HUnit.spec +++ b/ghc-HUnit.spec @@ -1,22 +1,27 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name HUnit +%global pkgver %{pkg_name}-%{version} -%bcond_without tests +%global callstack call-stack-0.1.0 + +%bcond_with tests Name: ghc-%{pkg_name} -# part of haskell-platform -Version: 1.3.1.1 -Release: 2%{?dist} -Summary: Unit testing framework for Haskell +Version: 1.5.0.0 +Release: 1%{?dist} +Summary: A unit testing framework for Haskell 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/%{callstack}/%{callstack}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: +#BuildRequires: ghc-call-stack-devel BuildRequires: ghc-deepseq-devel %if %{with tests} BuildRequires: ghc-filepath-devel @@ -39,15 +44,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 %{callstack} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{callstack} %ghc_lib_build %install +%ghc_libs_install %{callstack} %ghc_lib_install @@ -68,10 +84,13 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files -%doc CHANGELOG.md README.md examples/Example.hs +%doc CHANGELOG.md README.md examples %changelog +* Tue Feb 21 2017 Jens Petersen - 1.3.1.1-1 +- update to 1.5.0.0 + * Fri Feb 10 2017 Fedora Release Engineering - 1.3.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 56f0822..548af63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a73c6723345efecae8f3bfcbc45e5aa HUnit-1.3.1.1.tar.gz +SHA512 (HUnit-1.5.0.0.tar.gz) = 8be12e82db20ec34069424a47a5fac79d312fe4ad410d0136713431ffed80e020feee78f872b3043ffd41c2033cf643d91a0d8423d186ded152cab51b7888f4e