diff --git a/ghc-hjsmin.spec b/ghc-hjsmin.spec index e5182de..24e3455 100644 --- a/ghc-hjsmin.spec +++ b/ghc-hjsmin.spec @@ -2,14 +2,19 @@ %global pkg_name hjsmin +%bcond_with tests + +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} Version: 0.1.4.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Haskell implementation of a javascript minifier 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 @@ -18,8 +23,14 @@ BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-language-javascript-devel -BuildRequires: ghc-text-devel BuildRequires: ghc-optparse-applicative-devel +BuildRequires: ghc-text-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +%endif # End cabal-rpm deps %description @@ -29,13 +40,14 @@ other syntactic elements, without changing the semantics. %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}%{?_isa} = %{version}-%{release} %description devel -This package provides the development files for the Haskell %{pkg_name} library. +This package provides the Haskell %{pkg_name} library development files. %prep @@ -50,6 +62,12 @@ This package provides the development files for the Haskell %{pkg_name} library. %ghc_lib_install +%check +%if %{with tests} +%cabal test +%endif + + %post devel %ghc_pkg_recache @@ -60,14 +78,18 @@ This package provides the development files for the Haskell %{pkg_name} library. %files -f %{name}.files %doc LICENSE -%{_bindir}/%{pkg_name} %files devel -f %{name}-devel.files %doc TODO.txt README.markdown +%{_bindir}/%{pkg_name} %changelog +* Mon Nov 17 2014 Jens Petersen - 0.1.4.7-5 +- refresh to cblrpm-0.8.11 +- move executable to devel + * Tue Sep 30 2014 Ricky Elrod - 0.1.4.7-4 - Rebuild again.