js-flot and js-jquery currently provided by shake package

This commit is contained in:
Jens Petersen 2019-08-06 13:03:30 +08:00
parent 1521f2046b
commit 08586199eb
1 changed files with 4 additions and 10 deletions

View File

@ -5,9 +5,7 @@
%global pkgver %{pkg_name}-%{version}
%global criterionmeasurement criterion-measurement-0.1.1.0
%global jsflot js-flot-0.8.3
%global jsjquery js-jquery-3.3.1
%global subpkgs %{criterionmeasurement} %{jsflot} %{jsjquery}
%global subpkgs %{criterionmeasurement}
%bcond_with tests
@ -22,8 +20,6 @@ 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:
@ -44,8 +40,8 @@ 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-js-flot-prof
BuildRequires: ghc-js-jquery-prof
BuildRequires: ghc-microstache-prof
BuildRequires: ghc-mtl-prof
BuildRequires: ghc-mwc-random-prof
@ -120,8 +116,6 @@ 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}
@ -129,7 +123,7 @@ This package provides the Haskell %{pkg_name} profiling library.
%prep
# Begin cabal-rpm setup:
%setup -q -n %{pkgver} -a1 -a2 -a3
%setup -q -n %{pkgver} -a1
# End cabal-rpm setup