From 73a308a7d0862603e3327eb5f17e52dfd1a73c32 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Fri, 15 Sep 2017 12:49:39 +0900 Subject: [PATCH] memory and cryptonite are now separate Fedora packages --- ghc-cryptohash.spec | 41 ++++++++++++++--------------------------- sources | 2 -- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/ghc-cryptohash.spec b/ghc-cryptohash.spec index bac1e87..41e1738 100644 --- a/ghc-cryptohash.spec +++ b/ghc-cryptohash.spec @@ -1,33 +1,27 @@ -# generated by cabal-rpm-0.11.1 +# generated by cabal-rpm-0.11.2 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name cryptohash %global pkgver %{pkg_name}-%{version} -%global cryptonite cryptonite-0.21 -%global memory memory-0.14.1 -%global subpkgs %{memory} %{cryptonite} - %bcond_with tests Name: ghc-%{pkg_name} Version: 0.11.9 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Collection of crypto hashes, fast, pure and practical 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/%{cryptonite}/%{cryptonite}.tar.gz -Source2: https://hackage.haskell.org/package/%{memory}/%{memory}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: BuildRequires: ghc-byteable-devel BuildRequires: ghc-bytestring-devel -#BuildRequires: ghc-cryptonite-devel -#BuildRequires: ghc-memory-devel +BuildRequires: ghc-cryptonite-devel +BuildRequires: ghc-memory-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -38,9 +32,13 @@ BuildRequires: ghc-tasty-quickcheck-devel # End cabal-rpm deps %description +DEPRECATED: this library is still fully functional, but please use cryptonite +for new projects and convert old one to use cryptonite. This is where things +are at nowadays. + A collection of crypto hashes, with a practical incremental and one-pass, pure APIs, with performance close to the fastest implementations available -in others languages. The implementations are made in C with +in other languages. The implementations are made in C with a Haskell FFI wrapper that hide the C implementation. @@ -56,31 +54,17 @@ 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 %{cryptonite} -%ghc_lib_subpackage %{memory} -%endif - -%global version %{main_version} - - %prep -%setup -q -n %{pkgver} -a1 -a2 +%setup -q -n %{pkgver} %build -%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{subpkgs} %ghc_lib_install -%ghc_fix_rpath %{subpkgs} - %check %cabal_test @@ -103,6 +87,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Fri Sep 15 2017 Jens Petersen - 0.11.9-4 +- memory and cryptonite are now separate Fedora packages + * Wed Aug 02 2017 Fedora Release Engineering - 0.11.9-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index a2d2028..e2d6c68 100644 --- a/sources +++ b/sources @@ -1,3 +1 @@ -SHA512 (memory-0.14.1.tar.gz) = 12f8d8f3d14dc060b5da9950ddef398ac55464cf79438c501ba8eaa222817d474c191463fd5f97ed460f5ca4af6d3b643363eb2cca278c583cc14e442fe669cf -SHA512 (cryptonite-0.21.tar.gz) = 7f04ad5f7411bf90f343c13b71438fdd0e1e40cc5c9a5f1553c1f396a278f81cbe3a548ee8bc03b3b63bc66485ce36dc9a93c3dc3e5884f601bbae49efa98cc3 SHA512 (cryptohash-0.11.9.tar.gz) = d0eb07f59ae893df1a92a4dc45a98142e507ba3da25057ae4acf781b1b6200a2fb68dd2a19f1ba5f9395217bc81e7be1311a479dc3dcb4ec5338518a2f5239af