diff --git a/ghc-utf8-string.spec b/ghc-utf8-string.spec index 2a12848..16380c9 100644 --- a/ghc-utf8-string.spec +++ b/ghc-utf8-string.spec @@ -1,30 +1,29 @@ -# cabal2spec-0.25.2 # https://fedoraproject.org/wiki/Packaging:Haskell # https://fedoraproject.org/wiki/PackagingDrafts/Haskell %global pkg_name utf8-string -%global common_summary Haskell UTF8 layer for IO and Strings +%global common_summary Support for reading and writing UTF8 Strings -%global common_description The utf8-string package provides operations\ +%global common_description A UTF8 layer for IO and Strings. The utf8-string package provides operations\ for encoding UTF8 strings to Word8 lists and back, and for reading and writing\ UTF8 without truncation. Name: ghc-%{pkg_name} Version: 0.3.7 -Release: 4%{?dist} +Release: 5%{?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: utf8-string-0.3.7-bytestring-in-base-flag.patch + BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros %{!?without_hscolour:hscolour} -# END cabal2spec +BuildRequires: ghc-rpm-macros +# Begin cabal-rpm deps: BuildRequires: ghc-bytestring-devel +# End cabal-rpm deps %description %{common_description} @@ -32,6 +31,7 @@ BuildRequires: ghc-bytestring-devel %prep %setup -q -n %{pkg_name}-%{version} +%patch0 -p1 -b .orig %build @@ -54,6 +54,10 @@ BuildRequires: ghc-bytestring-devel %changelog +* Sat Nov 17 2012 Jens Petersen - 0.3.7-5 +- update with cabal-rpm +- unset bytestring-in-base flag + * Thu Jul 19 2012 Fedora Release Engineering - 0.3.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/utf8-string-0.3.7-bytestring-in-base-flag.patch b/utf8-string-0.3.7-bytestring-in-base-flag.patch new file mode 100644 index 0000000..d5ed8b3 --- /dev/null +++ b/utf8-string-0.3.7-bytestring-in-base-flag.patch @@ -0,0 +1,10 @@ +--- utf8-string-0.3.7/utf8-string.cabal~ 2011-08-25 21:26:51.000000000 +0900 ++++ utf8-string-0.3.7/utf8-string.cabal 2012-11-18 02:01:06.366515676 +0900 +@@ -15,6 +15,7 @@ + cabal-version: >= 1.2 + + flag bytestring-in-base ++ default: False + + library + Ghc-options: -W -O2