From 54a978db16f94742b07596c11db37ec8313ab42d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 26 Jan 2015 14:37:05 +0900 Subject: [PATCH] update to 0.8.0.2 --- .gitignore | 1 + aeson-disable-TH.patch | 8 ++++---- ghc-aeson.spec | 29 +++++++++++++++++++++++------ sources | 2 +- 4 files changed, 29 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index ea16adb..98b47f1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /aeson-0.6.0.2.tar.gz /aeson-0.6.1.0.tar.gz /aeson-0.6.2.1.tar.gz +/aeson-0.8.0.2.tar.gz diff --git a/aeson-disable-TH.patch b/aeson-disable-TH.patch index d02bcac..7257382 100644 --- a/aeson-disable-TH.patch +++ b/aeson-disable-TH.patch @@ -1,10 +1,10 @@ ---- aeson-0.6.2.1/aeson.cabal~ 2013-10-14 12:59:08.000000000 +0900 -+++ aeson-0.6.2.1/aeson.cabal 2014-04-20 15:03:05.037735911 +0900 -@@ -98,7 +98,6 @@ +--- aeson-0.8.0.2/aeson.cabal~ 2015-01-26 14:40:59.738569354 +0900 ++++ aeson-0.8.0.2/aeson.cabal 2015-01-26 14:44:24.394504016 +0900 +@@ -87,7 +87,6 @@ Data.Aeson.Generic Data.Aeson.Parser Data.Aeson.Types - Data.Aeson.TH other-modules: - Data.Aeson.Functions + Data.Aeson.Encode.ByteString diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 325a3d9..980cbb9 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -2,14 +2,16 @@ %global pkg_name aeson +%bcond_with tests + Name: ghc-%{pkg_name} -Version: 0.6.2.1 -Release: 4%{?dist} +Version: 0.8.0.2 +Release: 1%{?dist} Summary: Fast JSON parsing and encoding 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 +Url: https://hackage.haskell.org/package/%{pkg_name} +Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz # for archs without ghci Patch1: aeson-disable-TH.patch @@ -17,20 +19,26 @@ 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-containers-devel BuildRequires: ghc-deepseq-devel BuildRequires: ghc-dlist-devel BuildRequires: ghc-hashable-devel BuildRequires: ghc-mtl-devel -BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-scientific-devel BuildRequires: ghc-syb-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel +%if %{with tests} +BuildRequires: ghc-HUnit-devel +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +%endif # End cabal-rpm deps %description @@ -65,6 +73,12 @@ This package provides the Haskell %{pkg_name} library development files. %ghc_lib_install +%check +%if %{with tests} +%cabal test +%endif + + %post devel %ghc_pkg_recache @@ -82,6 +96,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Mon Jan 26 2015 Jens Petersen - 0.8.0.2-1 +- update to 0.8.0.2 + * Sat Aug 16 2014 Fedora Release Engineering - 0.6.2.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 3430bb8..4829922 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3e06429d5e10812c9d8b8f184455e9a1 aeson-0.6.2.1.tar.gz +33f09a236e47dfa87f5fb292f48d189a aeson-0.8.0.2.tar.gz