From d06265748300d6bdbfe1b8c17d371eaeef1018ea Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Feb 24 2017 07:40:42 +0000 Subject: update to 1.0.1.0 time-locale-compat moved to aeson --- diff --git a/.gitignore b/.gitignore index 5dab31d..b52c349 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /snap-core-0.9.6.4.tar.gz /snap-core-0.9.8.0.tar.gz /time-locale-compat-0.1.1.3.tar.gz +/snap-core-1.0.1.0.tar.gz diff --git a/ghc-snap-core.spec b/ghc-snap-core.spec index a006991..cebe179 100644 --- a/ghc-snap-core.spec +++ b/ghc-snap-core.spec @@ -1,48 +1,55 @@ -# generated by cabal-rpm-0.10.1 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name snap-core %global pkgver %{pkg_name}-%{version} -# https://bugzilla.redhat.com/show_bug.cgi?id=1256057 -%global subpkgver time-locale-compat-0.1.1.3 + +%bcond_with tests Name: ghc-%{pkg_name} -Version: 0.9.8.0 -Release: 4%{?dist} +Version: 1.0.1.0 +Release: 1%{?dist} Summary: Snap web framework core library License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: http://hackage.haskell.org/package/%{subpkgver}/%{subpkgver}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra >= 1.6.9 +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-HUnit-devel -BuildRequires: ghc-MonadCatchIO-transformers-devel BuildRequires: ghc-attoparsec-devel -BuildRequires: ghc-attoparsec-enumerator-devel -BuildRequires: ghc-blaze-builder-devel -BuildRequires: ghc-blaze-builder-enumerator-devel BuildRequires: ghc-bytestring-devel BuildRequires: ghc-case-insensitive-devel BuildRequires: ghc-containers-devel -BuildRequires: ghc-deepseq-devel BuildRequires: ghc-directory-devel -BuildRequires: ghc-enumerator-devel BuildRequires: ghc-filepath-devel -BuildRequires: ghc-hashable-devel +BuildRequires: ghc-io-streams-devel +BuildRequires: ghc-lifted-base-devel +BuildRequires: ghc-monad-control-devel BuildRequires: ghc-mtl-devel BuildRequires: ghc-random-devel +BuildRequires: ghc-readable-devel BuildRequires: ghc-regex-posix-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel -#BuildRequires: ghc-time-locale-compat-devel +BuildRequires: ghc-time-locale-compat-devel +BuildRequires: ghc-transformers-base-devel +BuildRequires: ghc-transformers-devel BuildRequires: ghc-unix-compat-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel -BuildRequires: ghc-zlib-enum-devel +%if %{with tests} +BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-deepseq-devel +BuildRequires: ghc-hashable-devel +BuildRequires: ghc-parallel-devel +BuildRequires: ghc-test-framework-devel +BuildRequires: ghc-test-framework-hunit-devel +BuildRequires: ghc-test-framework-quickcheck2-devel +BuildRequires: ghc-zlib-devel +%endif # End cabal-rpm deps Patch1: snap-core-0.9.2.2-portable-flag.patch @@ -64,30 +71,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{subpkgver} -%endif - -%global version %{main_version} - - %prep -%setup -q -n %{pkg_name}-%{version} -a1 +%setup -q -n %{pkg_name}-%{version} %patch1 -p1 -b .orig +cabal-tweak-drop-dep bytestring-builder %build -%ghc_libs_build %{subpkgver} %ghc_lib_build %install -%ghc_libs_install %{subpkgver} %ghc_lib_install +%check +%cabal_test + + %post devel %ghc_pkg_recache @@ -101,10 +102,13 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files -%doc README.SNAP.md README.md +%doc CONTRIBUTORS README.SNAP.md README.md %changelog +* Thu Feb 23 2017 Jens Petersen - 1.0.1.0-1 +- update to 1.0.1.0 + * Fri Feb 10 2017 Fedora Release Engineering - 0.9.8.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 903979b..8607a09 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -057aa93a06ef440c63de50f47d5c94a8 snap-core-0.9.8.0.tar.gz -7ef620b62e1b09873d152431dd6ad50f time-locale-compat-0.1.1.3.tar.gz +SHA512 (snap-core-1.0.1.0.tar.gz) = ed862530f235adca6f193c96d45b31705534089c58637bf8d0d9d8cd898db8f25494990e210151adc737c34e3cc59f5e0a47cc6b1e638dae9104e991e27dbe8b