From 9f14fd4d1505302ed42dd852abf1b5d17b2f00fa Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 28 Aug 2014 16:42:13 +0900 Subject: [PATCH] update to 0.7.0.2 --- .gitignore | 1 + ghc-blaze-html.spec | 32 ++++++++++++++++++++++++++++---- sources | 2 +- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 0238f66..5f3a5fd 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /blaze-html-0.5.1.0.tar.gz /blaze-html-0.6.0.0.tar.gz /blaze-html-0.6.1.1.tar.gz +/blaze-html-0.7.0.2.tar.gz diff --git a/ghc-blaze-html.spec b/ghc-blaze-html.spec index 3059377..91085d9 100644 --- a/ghc-blaze-html.spec +++ b/ghc-blaze-html.spec @@ -2,14 +2,19 @@ %global pkg_name blaze-html +%bcond_with tests + +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} -Version: 0.6.1.1 -Release: 4%{?dist} +Version: 0.7.0.2 +Release: 1%{?dist} Summary: A blazingly fast HTML combinator library for Haskell 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,6 +23,14 @@ BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-blaze-markup-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-text-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-containers-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -29,10 +42,11 @@ web applications in Haskell — it integrates well with Haskell web frameworks. %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 +64,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 @@ -66,6 +86,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Aug 28 2014 Jens Petersen - 0.7.0.2-1 +- update to 0.7.0.2 +- refresh to cblrpm-0.8.11 + * Sat Aug 16 2014 Fedora Release Engineering - 0.6.1.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index daf404b..352bda1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f9eda0a990cda190538b9e6ff73b05f3 blaze-html-0.6.1.1.tar.gz +003c882acb782b76464699ad1ba8e10d blaze-html-0.7.0.2.tar.gz