diff --git a/.gitignore b/.gitignore index f170fb0..090c2bf 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /bloomfilter-1.2.6.8.tar.gz /bloomfilter-1.2.6.10.tar.gz +/bloomfilter-2.0.0.0.tar.gz diff --git a/ghc-bloomfilter.spec b/ghc-bloomfilter.spec index 912152b..66c157a 100644 --- a/ghc-bloomfilter.spec +++ b/ghc-bloomfilter.spec @@ -2,14 +2,16 @@ %global pkg_name bloomfilter +%bcond_with tests + Name: ghc-%{pkg_name} -Version: 1.2.6.10 -Release: 8%{?dist} +Version: 2.0.0.0 +Release: 1%{?dist} Summary: Pure and impure Bloom Filter implementations License: BSD URL: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz +Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros @@ -17,6 +19,12 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-array-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-deepseq-devel +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -26,10 +34,11 @@ along with a family of hash function and an easy-to-use interface. %package devel Summary: Haskell %{pkg_name} library development files +Provides: %{name}-static = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. @@ -47,6 +56,12 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%check +%if %{with tests} +%cabal test +%endif + + %post devel %ghc_pkg_recache @@ -64,6 +79,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Aug 28 2014 Jens Petersen - 2.0.0.0-1 +- update to 2.0.0.0 +- refresh to cblrpm-0.8.11 + * Sat Aug 16 2014 Fedora Release Engineering - 1.2.6.10-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 5cc3bec..005c99c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -be762a717ce9e2b66d28bc5a0b13fa82 bloomfilter-1.2.6.10.tar.gz +8e82783d401d1fc40ba937585ebe7a90 bloomfilter-2.0.0.0.tar.gz