diff --git a/.gitignore b/.gitignore index 3834eb5..c7b324e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /io-streams-1.1.4.3.tar.gz /io-streams-1.1.4.5.tar.gz /io-streams-1.2.1.1.tar.gz +/io-streams-1.3.2.0.tar.gz diff --git a/ghc-io-streams.spec b/ghc-io-streams.spec index bed1d59..e20e46e 100644 --- a/ghc-io-streams.spec +++ b/ghc-io-streams.spec @@ -5,19 +5,19 @@ %bcond_with tests Name: ghc-%{pkg_name} -Version: 1.2.1.1 -Release: 2%{?dist} +Version: 1.3.2.0 +Release: 1%{?dist} Summary: Simple, composable, easy-to-use stream I/O License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Patch1: io-streams-bytestring-builder.patch BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-blaze-builder-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-network-devel BuildRequires: ghc-primitive-devel @@ -74,6 +74,7 @@ This package provides the Haskell %{pkg_name} library development files. %prep %setup -q -n %{pkg_name}-%{version} +%patch1 -p1 -b .orig %build @@ -83,6 +84,8 @@ This package provides the Haskell %{pkg_name} library development files. %install %ghc_lib_install +rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + %check %if %{with tests} @@ -99,7 +102,7 @@ This package provides the Haskell %{pkg_name} library development files. %files -f %{name}.files -%doc LICENSE +%license LICENSE %files devel -f %{name}-devel.files @@ -107,6 +110,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Sep 29 2015 Jens Petersen - 1.3.2.0-1 +- update to 1.3.2.0 +- patch out bytestring-builder + * Wed Jun 17 2015 Fedora Release Engineering - 1.2.1.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/io-streams-bytestring-builder.patch b/io-streams-bytestring-builder.patch new file mode 100644 index 0000000..cedc31c --- /dev/null +++ b/io-streams-bytestring-builder.patch @@ -0,0 +1,18 @@ +--- io-streams-1.3.2.0/io-streams.cabal~ 2015-08-05 06:25:51.000000000 +0900 ++++ io-streams-1.3.2.0/io-streams.cabal 2015-09-29 17:45:42.208861421 +0900 +@@ -120,7 +120,6 @@ + Build-depends: base >= 4 && <5, + attoparsec >= 0.10 && <0.14, + bytestring >= 0.9 && <0.11, +- bytestring-builder >= 0.10 && <0.11, + network >= 2.3 && <2.7, + primitive >= 0.2 && <0.7, + process >= 1.1 && <1.3, +@@ -201,7 +200,6 @@ + Build-depends: base >= 4 && <5, + attoparsec >= 0.10 && <0.14, + bytestring >= 0.9 && <0.11, +- bytestring-builder >= 0.10 && <0.11, + deepseq >= 1.2 && <1.5, + directory >= 1.1 && <2, + filepath >= 1.2 && <2, diff --git a/sources b/sources index 003eac9..39abfa0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7df15fac1560e5f5cf3404578d3b2d5 io-streams-1.2.1.1.tar.gz +acd8373aadbf1b53c356258bb408c8ab io-streams-1.3.2.0.tar.gz