From 5b631bdac81ca4a20b3c166623b2fff7153c9978 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 12 Jan 2018 11:10:59 +0900 Subject: [PATCH] time-locale-compat now packaged --- ghc-aeson.spec | 29 ++++++++++------------------- sources | 1 - 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/ghc-aeson.spec b/ghc-aeson.spec index 7eb13b0..2d908ef 100644 --- a/ghc-aeson.spec +++ b/ghc-aeson.spec @@ -1,23 +1,19 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.12 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name aeson %global pkgver %{pkg_name}-%{version} -%global timelocalecompat time-locale-compat-0.1.1.3 -%global subpkgs %{timelocalecompat} - %bcond_with tests Name: ghc-%{pkg_name} Version: 1.0.2.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Fast JSON parsing and encoding License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} 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-extra @@ -34,7 +30,7 @@ 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-time-locale-compat-devel BuildRequires: ghc-unordered-containers-devel BuildRequires: ghc-vector-devel %if %{with tests} @@ -59,35 +55,27 @@ high performance. Aeson was the father of Jason in Greek mythology. %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-doc = %{version}-%{release} +%if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} Requires(post): ghc-compiler = %{ghc_version} Requires(postun): ghc-compiler = %{ghc_version} +%endif Requires: %{name}%{?_isa} = %{version}-%{release} %description devel This package provides the Haskell %{pkg_name} library development files. -%global main_version %{version} - -%if %{defined ghclibdir} -%ghc_lib_subpackage %{subpkgs} -%endif - -%global version %{main_version} - - %prep -%setup -q -n %{pkgver} -a1 +%setup -q -n %{pkgver} %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install @@ -112,6 +100,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Jan 12 2018 Jens Petersen - 1.0.2.1-8 +- time-locale-compat is now packaged + * Wed Aug 02 2017 Fedora Release Engineering - 1.0.2.1-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 8de3c02..7c03913 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ SHA512 (aeson-1.0.2.1.tar.gz) = 2647cc22cec7bfbb9ac27e20a471333a7abd436bd338d8069093259fdf3829b04c16043ff669382461a4fdfa84dfd4f59837ece704f7a773ebf4aca21afa5e8e -SHA512 (time-locale-compat-0.1.1.3.tar.gz) = 62fd86d0b1f3707fb820a15dddc01d02fb701e942493e26927745556f19430706ae342a810942c511105cfa848f0d40e109aab471c8c0441caaf6ed4afb233a2