From 1521f2046b2a42a2ec9de9adf328c749a359c1b6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 5 Aug 2019 18:28:21 +0800 Subject: [PATCH] BR prof for lib and static for executable --- ghc-criterion.spec | 76 ++++++++++++++++++++++++---------------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/ghc-criterion.spec b/ghc-criterion.spec index fcccbc4..50b0539 100644 --- a/ghc-criterion.spec +++ b/ghc-criterion.spec @@ -1,11 +1,13 @@ -# generated by cabal-rpm-1.0.0 --subpackage +# generated by cabal-rpm-1.0.1 --subpackage # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name criterion %global pkgver %{pkg_name}-%{version} %global criterionmeasurement criterion-measurement-0.1.1.0 -%global subpkgs %{criterionmeasurement} +%global jsflot js-flot-0.8.3 +%global jsjquery js-jquery-3.3.1 +%global subpkgs %{criterionmeasurement} %{jsflot} %{jsjquery} %bcond_with tests @@ -20,46 +22,43 @@ 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/%{criterionmeasurement}/%{criterionmeasurement}.tar.gz +Source2: https://hackage.haskell.org/package/%{jsflot}/%{jsflot}.tar.gz +Source3: https://hackage.haskell.org/package/%{jsjquery}/%{jsjquery}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -%if %{with haddock} -BuildRequires: ghc-doc -%endif -%if %{with ghc_prof} -BuildRequires: ghc-prof -%endif BuildRequires: ghc-rpm-macros-extra +BuildRequires: ghc-Glob-prof +BuildRequires: ghc-aeson-prof +BuildRequires: ghc-ansi-wl-pprint-prof +BuildRequires: ghc-base-prof +BuildRequires: ghc-base-compat-batteries-prof +BuildRequires: ghc-binary-prof +BuildRequires: ghc-bytestring-prof +BuildRequires: ghc-cassava-prof +BuildRequires: ghc-code-page-prof +BuildRequires: ghc-containers-prof +#BuildRequires: ghc-criterion-measurement-prof +BuildRequires: ghc-deepseq-prof +BuildRequires: ghc-directory-prof +BuildRequires: ghc-exceptions-prof +BuildRequires: ghc-filepath-prof +#BuildRequires: ghc-js-flot-prof +#BuildRequires: ghc-js-jquery-prof +BuildRequires: ghc-microstache-prof +BuildRequires: ghc-mtl-prof +BuildRequires: ghc-mwc-random-prof +BuildRequires: ghc-optparse-applicative-prof +BuildRequires: ghc-parsec-prof +BuildRequires: ghc-statistics-prof +BuildRequires: ghc-text-prof +BuildRequires: ghc-time-prof +BuildRequires: ghc-transformers-prof +BuildRequires: ghc-transformers-compat-prof +BuildRequires: ghc-vector-prof +BuildRequires: ghc-vector-algorithms-prof BuildRequires: chrpath -BuildRequires: ghc-Glob-devel -BuildRequires: ghc-aeson-devel -BuildRequires: ghc-ansi-wl-pprint-devel -BuildRequires: ghc-base-compat-batteries-devel -BuildRequires: ghc-binary-devel -BuildRequires: ghc-bytestring-devel -BuildRequires: ghc-cassava-devel -BuildRequires: ghc-code-page-devel -BuildRequires: ghc-containers-devel -#BuildRequires: ghc-criterion-measurement-devel -BuildRequires: ghc-deepseq-devel -BuildRequires: ghc-directory-devel -BuildRequires: ghc-exceptions-devel -BuildRequires: ghc-filepath-devel -BuildRequires: ghc-js-flot-devel -BuildRequires: ghc-js-jquery-devel -BuildRequires: ghc-microstache-devel -BuildRequires: ghc-mtl-devel -BuildRequires: ghc-mwc-random-devel -BuildRequires: ghc-optparse-applicative-devel -BuildRequires: ghc-parsec-devel -BuildRequires: ghc-statistics-devel -BuildRequires: ghc-text-devel -BuildRequires: ghc-time-devel -BuildRequires: ghc-transformers-compat-devel -BuildRequires: ghc-transformers-devel -BuildRequires: ghc-vector-algorithms-devel -BuildRequires: ghc-vector-devel %if %{with tests} BuildRequires: ghc-HUnit-devel BuildRequires: ghc-QuickCheck-devel @@ -87,6 +86,7 @@ For examples of the kinds of reports that criterion generates, see %package devel Summary: Haskell %{pkg_name} library development files Provides: %{name}-static = %{version}-%{release} +Provides: %{name}-static%{?_isa} = %{version}-%{release} %if %{defined ghc_version} Requires: ghc-compiler = %{ghc_version} %endif @@ -120,6 +120,8 @@ This package provides the Haskell %{pkg_name} profiling library. %if %{defined ghclibdir} %ghc_lib_subpackage %{criterionmeasurement} +%ghc_lib_subpackage %{jsflot} +%ghc_lib_subpackage %{jsjquery} %endif %global version %{main_version} @@ -127,7 +129,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 +%setup -q -n %{pkgver} -a1 -a2 -a3 # End cabal-rpm setup