diff --git a/.gitignore b/.gitignore index c4ec475..70cff42 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /hashable-1.1.2.2.tar.gz /hashable-1.1.2.3.tar.gz /hashable-1.1.2.5.tar.gz +/hashable-1.2.1.0.tar.gz diff --git a/ghc-hashable.spec b/ghc-hashable.spec index c61effd..a9c8c0e 100644 --- a/ghc-hashable.spec +++ b/ghc-hashable.spec @@ -2,37 +2,48 @@ %global pkg_name hashable +%bcond_with tests + Name: ghc-%{pkg_name} -# part of haskell-platform-2013.2 -Version: 1.1.2.5 -Release: 4%{?dist} +# part of haskell-platform +Version: 1.2.1.0 +Release: 1%{?dist} Summary: Class for types convertible to a hash value 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 # Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel BuildRequires: ghc-text-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-random-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-unix-devel +%endif # End cabal-rpm deps %description -This package defines a class, 'Hashable', for types that -can be converted to a hash value. This class -exists for the benefit of hashing-based data -structures. The package provides instances for -basic types and a way to combine hash values. +This package defines a class, 'Hashable', for types that can be converted to a +hash value. This class exists for the benefit of hashing-based data structures. +The package provides instances for basic types and a way to combine hash +values. %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. @@ -50,6 +61,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 @@ -67,6 +84,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Jun 03 2014 Jens Petersen - 1.2.1.0-1 +- update to 1.2.1.0 with cblrpm-0.8.11 + * Sat Aug 03 2013 Fedora Release Engineering - 1.1.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild diff --git a/sources b/sources index 24cf5af..2e45b69 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dc0f9617cea4c2da802394db301d1432 hashable-1.1.2.5.tar.gz +74f7cadb836e63f4d4b1a24be401228d hashable-1.2.1.0.tar.gz