From 337e38d15369289ced8a02ed0726132c57639f46 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 18 Jul 2020 21:36:00 +0800 Subject: [PATCH] HsYAML was packaged --- .gitignore | 1 - ghc-doctemplates.spec | 21 ++++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 1de164f..25bdcbe 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,6 @@ /doctemplates-0.8.tar.gz /doclayout-0.2.0.1.tar.gz /text-conversions-0.3.0.tar.gz -/HsYAML-0.2.1.0.tar.gz /errors-2.3.0.tar.gz /doctemplates-0.8.2.tar.gz /doclayout-0.3.tar.gz diff --git a/ghc-doctemplates.spec b/ghc-doctemplates.spec index 4321809..0ec4b74 100644 --- a/ghc-doctemplates.spec +++ b/ghc-doctemplates.spec @@ -4,11 +4,10 @@ %global pkg_name doctemplates %global pkgver %{pkg_name}-%{version} -%global HsYAML HsYAML-0.2.1.0 %global doclayout doclayout-0.3 %global errors errors-2.3.0 %global textconversions text-conversions-0.3.0 -%global subpkgs %{HsYAML} %{doclayout} %{errors} %{textconversions} +%global subpkgs %{doclayout} %{errors} %{textconversions} # testsuite missing deps: doclayout tasty-golden @@ -22,16 +21,15 @@ 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/%{HsYAML}/%{HsYAML}.tar.gz -Source2: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz -Source3: https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz -Source4: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz +Source1: https://hackage.haskell.org/package/%{doclayout}/%{doclayout}.tar.gz +Source2: https://hackage.haskell.org/package/%{errors}/%{errors}.tar.gz +Source3: https://hackage.haskell.org/package/%{textconversions}/%{textconversions}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra -#BuildRequires: ghc-HsYAML-prof +BuildRequires: ghc-HsYAML-prof BuildRequires: ghc-aeson-prof BuildRequires: ghc-base-prof BuildRequires: ghc-containers-prof @@ -45,9 +43,6 @@ BuildRequires: ghc-text-prof #BuildRequires: ghc-text-conversions-prof BuildRequires: ghc-unordered-containers-prof BuildRequires: ghc-vector-prof -# for missing dep 'HsYAML': -BuildRequires: ghc-bytestring-prof -BuildRequires: ghc-deepseq-prof # for missing dep 'errors': BuildRequires: ghc-exceptions-prof BuildRequires: ghc-transformers-prof @@ -102,7 +97,6 @@ This package provides the Haskell %{pkg_name} profiling library. %global main_version %{version} %if %{defined ghclibdir} -%ghc_lib_subpackage %{HsYAML} %ghc_lib_subpackage %{doclayout} %ghc_lib_subpackage %{errors} %ghc_lib_subpackage %{textconversions} @@ -113,7 +107,7 @@ This package provides the Haskell %{pkg_name} profiling library. %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} -a1 -a2 -a3 -a4 +%setup -q -n %{pkgver} -a1 -a2 -a3 # End cabal-rpm setup @@ -132,6 +126,7 @@ This package provides the Haskell %{pkg_name} profiling library. rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} # End cabal-rpm install +rm %{buildroot}%{_datadir}/%{doclayout}/{README.md,changelog.md} %files -f %{name}.files @@ -161,7 +156,7 @@ rm %{buildroot}%{_datadir}/%{pkgver}/{README.md,changelog.md} * Sun Jun 07 2020 Jens Petersen - 0.8-1 - update to 0.8 -- subpackage HsYAML, doclayout, text-conversions, and errors +- subpackage doclayout, text-conversions, and errors * Wed Feb 19 2020 Jens Petersen - 0.2.2.1-7 - refresh to cabal-rpm-2.0.2