filepattern, js-flot and js-jquery were packaged

This commit is contained in:
Jens Petersen 2020-07-16 01:13:53 +08:00
parent ea39c1be73
commit 0ff9900211
2 changed files with 8 additions and 27 deletions

View File

@ -4,12 +4,9 @@
%global pkg_name shake
%global pkgver %{pkg_name}-%{version}
%global jsflot js-flot-0.8.3
%global jsjquery js-jquery-3.3.1
%global filepattern filepattern-0.1.2
%global heaps heaps-0.3.6.1
%global jsdgtable js-dgtable-0.5.2
%global subpkgs %{jsflot} %{jsjquery} %{filepattern} %{heaps} %{jsdgtable}
%global subpkgs %{heaps} %{jsdgtable}
# failing to build
%bcond_with tests
@ -24,11 +21,8 @@ License: BSD
Url: https://hackage.haskell.org/package/%{name}
# Begin cabal-rpm sources:
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{jsflot}/%{jsflot}.tar.gz
Source2: https://hackage.haskell.org/package/%{jsjquery}/%{jsjquery}.tar.gz
Source3: https://hackage.haskell.org/package/%{filepattern}/%{filepattern}.tar.gz
Source4: https://hackage.haskell.org/package/%{heaps}/%{heaps}.tar.gz
Source5: https://hackage.haskell.org/package/%{jsdgtable}/%{jsdgtable}.tar.gz
Source1: https://hackage.haskell.org/package/%{heaps}/%{heaps}.tar.gz
Source2: https://hackage.haskell.org/package/%{jsdgtable}/%{jsdgtable}.tar.gz
# End cabal-rpm sources
Patch0: shake-disable-embed-files.patch
@ -42,12 +36,12 @@ BuildRequires: ghc-deepseq-prof
BuildRequires: ghc-directory-prof
BuildRequires: ghc-extra-prof
BuildRequires: ghc-filepath-prof
#BuildRequires: ghc-filepattern-prof
BuildRequires: ghc-filepattern-prof
BuildRequires: ghc-hashable-prof
#BuildRequires: ghc-heaps-prof
#BuildRequires: ghc-js-dgtable-prof
#BuildRequires: ghc-js-flot-prof
#BuildRequires: ghc-js-jquery-prof
BuildRequires: ghc-js-flot-prof
BuildRequires: ghc-js-jquery-prof
BuildRequires: ghc-primitive-prof
BuildRequires: ghc-process-prof
BuildRequires: ghc-random-prof
@ -62,12 +56,6 @@ BuildRequires: ghc-QuickCheck-devel
%endif
Requires: %{name}-common = %{version}-%{release}
# End cabal-rpm deps
# for js-flot
BuildRequires: ghc-HTTP-prof
# hack until they are packaged since now embedded
BuildRequires: ghc-js-jquery
BuildRequires: ghc-js-dgtable
BuildRequires: ghc-js-flot
%description
Shake is a Haskell library for writing build systems - designed as a
@ -141,9 +129,6 @@ This package provides the Haskell %{name} profiling library.
%global main_version %{version}
%if %{defined ghclibdir}
%ghc_lib_subpackage %{jsflot}
%ghc_lib_subpackage %{jsjquery}
%ghc_lib_subpackage %{filepattern}
%ghc_lib_subpackage %{heaps}
%ghc_lib_subpackage %{jsdgtable}
%endif
@ -153,7 +138,7 @@ This package provides the Haskell %{name} profiling library.
%prep
# Begin cabal-rpm setup:
%setup -q -a1 -a2 -a3 -a4 -a5
%setup -q -a1 -a2
# End cabal-rpm setup
%patch0 -p1 -b .orig
@ -173,8 +158,6 @@ This package provides the Haskell %{name} profiling library.
mv %{buildroot}%{_ghcdocdir}{,-common}
# End cabal-rpm install
echo "%{_datadir}/%{jsflot}/" >> %{jsflot}/ghc-js-flot.files
echo "%{_datadir}/%{jsjquery}/" >> %{jsjquery}/ghc-js-jquery.files
echo "%{_datadir}/%{jsdgtable}/" >> %{jsdgtable}/ghc-js-dgtable.files
rm %{buildroot}%{_datadir}/%{pkgver}/docs/manual/*
@ -219,6 +202,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/docs/manual/*
* Fri Jun 19 2020 Jens Petersen <petersen@redhat.com> - 0.19.1-15
- update to 0.19.1
- disable js embedding
- filepattern, js-flot, and js-jquery were packaged
* Fri Feb 14 2020 Jens Petersen <petersen@redhat.com> - 0.18.5-14
- update to 0.18.5

View File

@ -1,6 +1,3 @@
SHA512 (filepattern-0.1.2.tar.gz) = 16866d70efdf55ee4e6b246eb7f7300c9ad4c148d8136d817f601b9c0cac95eb1ddaf57ab0b6fad539298b55128fe5c255c31fd152a713bf312488eae823da23
SHA512 (heaps-0.3.6.1.tar.gz) = 7c3cfb4ca95538a51b418ab2d42171883c9c51860f63e6836d42845a43cead825016fce74ed5e866decf0a6812433c3ecd6989161f2303939bbcad8ef4aab0ef
SHA512 (js-dgtable-0.5.2.tar.gz) = 5854b5083af33ae533fb90c12f88e1b7b777a9a02fc9f38551033f1b31e580b2839453f137bb71e7c7a54ab7ccf652c7eddb60d3f5d30a0ac71bfb668ebe4337
SHA512 (js-flot-0.8.3.tar.gz) = 5732938b37e9036156528c0d34cd99b45405db81d1e70b6651b056075ea8d9b616da1ae709c2de1f2f5be044236a3b81fc358d973769fca26993500ff9d0dabf
SHA512 (js-jquery-3.3.1.tar.gz) = 3222259a4342bc5156d5360385a478e235def04db0381cc48f342baac5018e91350dce760adb9b9ada796bc6341d5629f807672f629ee127faefe521801d62bb
SHA512 (shake-0.19.1.tar.gz) = dbc0e4e60b5c1e622538f4bdee011a4e2d67ea7dd7cead2cf56c1cb3490562858c0af58e920a0267ba1f3569af386a8a3c2aa0429bfb24ad3bca460975e714d9