From 5d9cbc1fd092e2572dbe8e5e70efddceb3221b9a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 28 Aug 2014 18:19:28 +0900 Subject: [PATCH] update to 1.2.1.1 --- .gitignore | 1 + ghc-shakespeare.spec | 27 +++++++++++++++++++++++---- sources | 2 +- 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f8c550e..9681aa1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /shakespeare-1.0.4.tar.gz /shakespeare-1.0.5.tar.gz /shakespeare-1.0.5.1.tar.gz +/shakespeare-1.2.1.1.tar.gz diff --git a/ghc-shakespeare.spec b/ghc-shakespeare.spec index 9575760..41ad388 100644 --- a/ghc-shakespeare.spec +++ b/ghc-shakespeare.spec @@ -2,14 +2,19 @@ %global pkg_name shakespeare +%bcond_with tests + +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} -Version: 1.0.5.1 -Release: 3%{?dist} +Version: 1.2.1.1 +Release: 1%{?dist} Summary: Toolkit for compile-time interpolated templates License: MIT 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 @@ -23,6 +28,9 @@ BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel ExclusiveArch: %{ghc_arches_with_ghci} +%if %{with tests} +BuildRequires: ghc-hspec-devel +%endif # End cabal-rpm deps %description @@ -39,10 +47,11 @@ for more details. %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. @@ -60,6 +69,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 @@ -76,6 +91,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Aug 28 2014 Jens Petersen - 1.2.1.1-1 +- update to 1.2.1.1 +- refresh to cblrpm-0.8.11 + * Sat Aug 16 2014 Fedora Release Engineering - 1.0.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 4e5bd4d..5aa9531 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -08d02e84e34e1eedc5aa178c3a00973a shakespeare-1.0.5.1.tar.gz +376e7fdadbc844340ee73a28ec387d6b shakespeare-1.2.1.1.tar.gz