From 744a86e87ede7b21adc0a7f50c3bd458474fa52b Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 1 Sep 2014 16:51:27 +0900 Subject: [PATCH] allow Cabal-1.18 and refresh to cblrpm-0.8.11 --- ghc-cabal-file-th.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/ghc-cabal-file-th.spec b/ghc-cabal-file-th.spec index 9f8ae1f..aceaa7e 100644 --- a/ghc-cabal-file-th.spec +++ b/ghc-cabal-file-th.spec @@ -2,14 +2,17 @@ %global pkg_name cabal-file-th +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} Version: 0.2.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Template Haskell expressions for reading cabal files 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 @@ -25,10 +28,11 @@ Template Haskell expressions for reading fields from a project's cabal file. %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. @@ -36,6 +40,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +cabal-tweak-dep-ver Cabal '< 1.17' '< 1.19' %build @@ -63,6 +68,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Sep 1 2014 Jens Petersen - 0.2.3-8 +- allow Cabal-1.18 +- refresh to cblrpm-0.8.11 + * Sat Aug 16 2014 Fedora Release Engineering - 0.2.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild