From 3554e01ba1664f462b910b4cccfdbbeed45d772d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Thu, 5 Aug 2021 13:22:10 +0800 Subject: [PATCH] subpackage splitmix (moved from QuickCheck) --- .gitignore | 1 + ghc-random.spec | 30 ++++++++++++++++++++++++------ sources | 1 + 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 2576ec5..5aa0926 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /random-1.0.1.1.tar.gz /random-1.1.tar.gz /random-1.2.0.tar.gz +/splitmix-0.1.0.3.tar.gz diff --git a/ghc-random.spec b/ghc-random.spec index 7aa323f..c0bba7b 100644 --- a/ghc-random.spec +++ b/ghc-random.spec @@ -1,31 +1,37 @@ -# generated by cabal-rpm-2.0.9 +# generated by cabal-rpm-2.0.10 --subpackage # https://docs.fedoraproject.org/en-US/packaging-guidelines/Haskell/ %global pkg_name random %global pkgver %{pkg_name}-%{version} +%global splitmix splitmix-0.1.0.3 +%global subpkgs %{splitmix} + # testsuite missing deps: tasty-expected-failure tasty-smallcheck Name: ghc-%{pkg_name} Version: 1.2.0 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Pseudo-random number generation License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} # Begin cabal-rpm sources: Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz -Source1: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal +Source1: https://hackage.haskell.org/package/%{splitmix}/%{splitmix}.tar.gz +Source2: https://hackage.haskell.org/package/%{pkgver}/%{pkg_name}.cabal#/%{pkgver}.cabal # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: dos2unix BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra BuildRequires: ghc-base-prof BuildRequires: ghc-bytestring-prof BuildRequires: ghc-deepseq-prof BuildRequires: ghc-mtl-prof -BuildRequires: ghc-splitmix-prof +#BuildRequires: ghc-splitmix-prof # End cabal-rpm deps %description @@ -111,21 +117,32 @@ This package provides the Haskell %{pkg_name} profiling library. %endif +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{splitmix} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal +%setup -q -n %{pkgver} -a1 +dos2unix -k -n %{SOURCE2} %{pkg_name}.cabal # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install # End cabal-rpm install @@ -154,6 +171,7 @@ dos2unix -k -n %{SOURCE1} %{pkg_name}.cabal %changelog * Thu Aug 5 2021 Jens Petersen - 1.2.0-1 - update to 1.2.0 +- splitmix now subpackage (moved from QuickCheck) * Thu Jul 22 2021 Fedora Release Engineering - 1.1-18 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 2f39137..24f83f9 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (random-1.2.0.tar.gz) = e482f318c245d87824d440885c4ecbd1c9bd85a3b3aa4d7fbb4a82da0cfd31749caa9ff7881c94b731035133fd1d550a0cb8bd4da958d3c72519bddcadc6c2e5 +SHA512 (splitmix-0.1.0.3.tar.gz) = 22a3f0759e1c1150aabde01a77b48087509dfc7ff9614e97e5e06af73f533170993ff2e18101d940e7ddba81b8d6e496795be3851fccfa07b75e9d922f325064