From 0fb6b30c8fed136e7f55b96f7d5b3e07192d6397 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 17 Nov 2012 22:57:12 +0900 Subject: [PATCH] update with cabal-rpm and disable bytestring-in-base flag --- digest-0.0.1.1-bytestring-in-base.patch | 10 ++++++++++ ghc-digest.spec | 22 +++++++++++++--------- 2 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 digest-0.0.1.1-bytestring-in-base.patch diff --git a/digest-0.0.1.1-bytestring-in-base.patch b/digest-0.0.1.1-bytestring-in-base.patch new file mode 100644 index 0000000..4acd8e4 --- /dev/null +++ b/digest-0.0.1.1-bytestring-in-base.patch @@ -0,0 +1,10 @@ +--- digest-0.0.1.1/digest.cabal~ 2012-03-09 16:43:29.000000000 +0900 ++++ digest-0.0.1.1/digest.cabal 2012-11-17 22:43:34.027421368 +0900 +@@ -22,6 +22,7 @@ + flag bytestring-in-base + description: In the ghc-6.6 era the bytestring modules were + included in the base package. ++ default: False + + source-repository head + type: git diff --git a/ghc-digest.spec b/ghc-digest.spec index 82efcfe..51f7322 100644 --- a/ghc-digest.spec +++ b/ghc-digest.spec @@ -1,10 +1,9 @@ -# cabal2spec-0.25.2 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name digest -%global common_summary Haskell %{pkg_name} library +%global common_summary Cryptographic hashes for bytestrings %global common_description This package provides efficient cryptographic hash implementations for strict\ and lazy bytestrings. For now, CRC32 and Adler32 are supported; they are\ @@ -12,20 +11,20 @@ implemented as FFI bindings to efficient code from zlib. Name: ghc-%{pkg_name} Version: 0.0.1.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: %{common_summary} -Group: System Environment/Libraries License: BSD -# BEGIN cabal2spec URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -ExclusiveArch: %{ghc_arches} +Patch0: digest-0.0.1.1-bytestring-in-base.patch + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec -BuildRequires: zlib-devel%{?_isa} +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel +# End cabal-rpm deps +BuildRequires: zlib-devel%{?_isa} %description %{common_description} @@ -33,6 +32,7 @@ BuildRequires: ghc-bytestring-devel %prep %setup -q -n %{pkg_name}-%{version} +%patch0 -p1 -b .orig %build @@ -56,6 +56,10 @@ Requires: zlib-devel%{?_isa} %changelog +* Sat Nov 17 2012 Jens Petersen - 0.0.1.1-4 +- update with cabal-rpm +- disable bytestring-in-base flag with patch + * Thu Jul 19 2012 Fedora Release Engineering - 0.0.1.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild