diff --git a/.gitignore b/.gitignore index 98b47f1..e8cd205 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /aeson-0.6.1.0.tar.gz /aeson-0.6.2.1.tar.gz /aeson-0.8.0.2.tar.gz +/aeson-1.0.2.1.tar.gz +/time-locale-compat-0.1.1.3.tar.gz diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 7db46e6..27086f4 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,39 +1,49 @@ -# generated by cabal-rpm-0.10.0 +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson +%global pkgver %{pkg_name}-%{version} + +%global timelocalecompat time-locale-compat-0.1.1.3 %bcond_with tests Name: ghc-%{pkg_name} -Version: 0.8.0.2 +Version: 1.0.2.1 Release: 5%{?dist} Summary: Fast JSON parsing and encoding License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{timelocalecompat}/%{timelocalecompat}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: ghc-attoparsec-devel +BuildRequires: ghc-base-compat-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-scientific-devel -BuildRequires: ghc-syb-devel +BuildRequires: ghc-tagged-devel BuildRequires: ghc-template-haskell-devel BuildRequires: ghc-text-devel BuildRequires: ghc-time-devel +#BuildRequires: ghc-time-locale-compat-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel +BuildRequires: ghc-base-orphans-devel +BuildRequires: ghc-base16-bytestring-devel +BuildRequires: ghc-generic-deriving-devel +BuildRequires: ghc-hashable-time-devel +BuildRequires: ghc-quickcheck-instances-devel BuildRequires: ghc-test-framework-devel BuildRequires: ghc-test-framework-hunit-devel BuildRequires: ghc-test-framework-quickcheck2-devel @@ -57,15 +67,26 @@ 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 %{timelocalecompat} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{timelocalecompat} %ghc_lib_build %install +%ghc_libs_install %{timelocalecompat} %ghc_lib_install @@ -90,6 +111,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Feb 21 2017 Jens Petersen - 1.0.2.1-5 +- update to 1.0.2.1 +- subpackage time-locale-compat + * Fri Feb 10 2017 Fedora Release Engineering - 0.8.0.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 4829922..8de3c02 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -33f09a236e47dfa87f5fb292f48d189a aeson-0.8.0.2.tar.gz +SHA512 (aeson-1.0.2.1.tar.gz) = 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e +SHA512 (time-locale-compat-0.1.1.3.tar.gz) = 62fd86d0b1f3707fb820a15dddc01d02fb701e942493e26927745556f19430706ae342a810942c511105cfa848f0d40e109aab471c8c0441caaf6ed4afb233a2