From 8469735df7a16c1e0325a6b57b224a5ac8c9eb5d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 25 Feb 2017 12:10:12 +0900 Subject: [PATCH] use subpkgs and ghc-rpm-macros-extra --- ghc-data-default.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ghc-data-default.spec b/ghc-data-default.spec index de58c62..b320286 100644 --- a/ghc-data-default.spec +++ b/ghc-data-default.spec @@ -7,6 +7,7 @@ %global instancescontainers data-default-instances-containers-0.0.1 %global instancesdlist data-default-instances-dlist-0.0.1 %global instancesoldlocale data-default-instances-old-locale-0.0.1 +%global subpkgs %{instancescontainers} %{instancesdlist} %{instancesoldlocale} Name: ghc-%{pkg_name} Version: 0.7.1.1 @@ -21,7 +22,7 @@ Source2: https://hackage.haskell.org/package/%{instancesdlist}/%{instance Source3: https://hackage.haskell.org/package/%{instancesoldlocale}/%{instancesoldlocale}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: BuildRequires: ghc-data-default-class-devel #BuildRequires: ghc-data-default-instances-containers-devel @@ -63,12 +64,12 @@ This package provides the Haskell %{pkg_name} library development files. %build -%ghc_libs_build %{instancescontainers} %{instancesdlist} %{instancesoldlocale} +%ghc_libs_build %{subpkgs} %ghc_lib_build %install -%ghc_libs_install %{instancescontainers} %{instancesdlist} %{instancesoldlocale} +%ghc_libs_install %{subpkgs} %ghc_lib_install