diff --git a/.gitignore b/.gitignore index 99af215..0eea4ff 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /MemoTrie-0.6.2.tar.gz /MemoTrie-0.6.4.tar.gz /MemoTrie-0.6.7.tar.gz +/newtype-generics-0.5.tar.gz diff --git a/ghc-MemoTrie.spec b/ghc-MemoTrie.spec index 49dac35..86d50dd 100644 --- a/ghc-MemoTrie.spec +++ b/ghc-MemoTrie.spec @@ -4,19 +4,24 @@ %global pkg_name MemoTrie %global pkgver %{pkg_name}-%{version} +%global newtypegenerics newtype-generics-0.5 +%global subpkgs %{newtypegenerics} + Name: ghc-%{pkg_name} Version: 0.6.7 +# can only be reset when all subpkgs bumped Release: 1%{?dist} Summary: Trie-based memo functions License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{newtypegenerics}/%{newtypegenerics}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: -BuildRequires: ghc-newtype-generics-devel +#BuildRequires: ghc-newtype-generics-devel # End cabal-rpm deps %description @@ -39,16 +44,28 @@ Requires: %{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{pkg_name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{newtypegenerics} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 %build +%ghc_libs_build %{subpkgs} %ghc_lib_build %install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{subpkgs} %post devel @@ -68,8 +85,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog -* Thu Feb 23 2017 Jens Petersen - 0.6.7-1 +* Tue Feb 28 2017 Jens Petersen - 0.6.7-1 - update to 0.6.7 +- subpackage newtype-generics * Fri Feb 10 2017 Fedora Release Engineering - 0.6.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild