From 20a9cc9c94ddfe072a3fee61ad12b8b1dd58d1fe Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 21 Feb 2019 10:08:23 +0800 Subject: [PATCH] update to 0.0.0.4 --- .gitignore | 1 + 0001-drop-bytestring-builder-dep.patch | 9 --------- ghc-bsb-http-chunked.spec | 25 ++++++++++++++++++++----- sources | 2 +- 4 files changed, 22 insertions(+), 15 deletions(-) delete mode 100644 0001-drop-bytestring-builder-dep.patch diff --git a/.gitignore b/.gitignore index 1836a51..e87ae90 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /bsb-http-chunked-0.0.0.2.tar.gz +/bsb-http-chunked-0.0.0.4.tar.gz diff --git a/0001-drop-bytestring-builder-dep.patch b/0001-drop-bytestring-builder-dep.patch deleted file mode 100644 index f38f2ef..0000000 --- a/0001-drop-bytestring-builder-dep.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- bsb-http-chunked.cabal.orig 2018-03-13 00:26:19.000000000 -0400 -+++ bsb-http-chunked.cabal 2018-07-09 00:42:24.511155969 -0400 -@@ -43,5 +43,4 @@ - Blaze.ByteString.Builder.Internal.Write - - build-depends: base >= 4.3 && < 4.12, -- bytestring >= 0.9 && < 0.11, -- bytestring-builder < 0.11 -+ bytestring >= 0.9 && < 0.11 diff --git a/ghc-bsb-http-chunked.spec b/ghc-bsb-http-chunked.spec index 873a292..853903c 100644 --- a/ghc-bsb-http-chunked.spec +++ b/ghc-bsb-http-chunked.spec @@ -4,9 +4,11 @@ %global pkg_name bsb-http-chunked %global pkgver %{pkg_name}-%{version} +%bcond_with tests + Name: ghc-%{pkg_name} -Version: 0.0.0.2 -Release: 4%{?dist} +Version: 0.0.0.4 +Release: 1%{?dist} Summary: Chunked HTTP transfer encoding for bytestring builders License: BSD @@ -14,13 +16,20 @@ Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz # End cabal-rpm sources -# No longer required with latest bytestring -Patch0001: 0001-drop-bytestring-builder-dep.patch # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros BuildRequires: ghc-bytestring-devel +%if %{with tests} +BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-blaze-builder-devel +BuildRequires: ghc-doctest-devel +BuildRequires: ghc-hedgehog-devel +BuildRequires: ghc-tasty-devel +BuildRequires: ghc-tasty-hedgehog-devel +BuildRequires: ghc-tasty-hunit-devel +%endif # End cabal-rpm deps %description @@ -50,7 +59,6 @@ files. # Begin cabal-rpm setup: %setup -q -n %{pkgver} # End cabal-rpm setup -%patch0001 %build @@ -65,6 +73,10 @@ files. # End cabal-rpm install +%check +%cabal_test + + %post devel %ghc_pkg_recache @@ -84,6 +96,9 @@ files. %changelog +* Thu Feb 21 2019 Jens Petersen - 0.0.0.4-1 +- update to 0.0.0.4 + * Sun Feb 17 2019 Jens Petersen - 0.0.0.2-4 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 1789871..2b26f2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (bsb-http-chunked-0.0.0.2.tar.gz) = 8ce8ba1065e2ec219d6bb663b597e049bac403dc8d061907e677781333d878be1fed48d4a3f6c34801afa5e89bdbd965b8dee71515c7fb2e6f58e8957194fb22 +SHA512 (bsb-http-chunked-0.0.0.4.tar.gz) = 74c04c2fd372067c42d3631cdfc2ad7093c0c3af1145833ab307c538dbb936d2042492d4e81c520c3adde8634df29ff8558822f06f226c52d16abb4a35ab1a13