diff --git a/ghc-hashable.changes b/ghc-hashable.changes index 6a36a42..3aea532 100644 --- a/ghc-hashable.changes +++ b/ghc-hashable.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 10 17:08:32 UTC 2016 - psimons@suse.com + +- Update to version 1.2.4.0 revision 0 with cabal2obs. + ------------------------------------------------------------------- Sun Jan 17 10:13:24 UTC 2016 - mimi.vx@gmail.com diff --git a/ghc-hashable.spec b/ghc-hashable.spec index 6cfec8c..627d59e 100644 --- a/ghc-hashable.spec +++ b/ghc-hashable.spec @@ -1,7 +1,7 @@ # # spec file for package ghc-hashable # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,23 +17,30 @@ %global pkg_name hashable - -Name: ghc-hashable +%bcond_with tests +Name: ghc-%{pkg_name} Version: 1.2.4.0 Release: 0 Summary: A class for types that can be converted to a hash value License: BSD-3-Clause Group: System/Libraries - -Url: http://hackage.haskell.org/package/%{pkg_name} -Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-build - +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://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-rpm-macros BuildRequires: ghc-text-devel +BuildRoot: %{_tmppath}/%{name}-%{version}-build +%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 @@ -42,32 +49,38 @@ 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 Group: Development/Libraries/Other -Provides: %{name}-static = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} -Requires: %{name} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. - %prep %setup -q -n %{pkg_name}-%{version} + %build -%ifarch i586 +%ifarch i586 %define cabal_configure_options -f"-sse2" %endif %ghc_lib_build + %install %ghc_lib_install + +%check +%if %{with tests} +%{cabal} test +%endif + + %post devel %ghc_pkg_recache