diff --git a/.gitignore b/.gitignore index 5f420de..ef4b528 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /tasty-0.11.3.tar.gz /tasty-0.12.0.1.tar.gz /tasty-1.0.1.1.tar.gz +/tasty-1.1.0.4.tar.gz +/wcwidth-0.0.2.tar.gz diff --git a/ghc-tasty.spec b/ghc-tasty.spec index 7b07483..3d9548b 100644 --- a/ghc-tasty.spec +++ b/ghc-tasty.spec @@ -4,20 +4,26 @@ %global pkg_name tasty %global pkgver %{pkg_name}-%{version} +%global wcwidth wcwidth-0.0.2 +%global subpkgs %{wcwidth} + Name: ghc-%{pkg_name} -Version: 1.0.1.1 -Release: 5%{?dist} +Version: 1.1.0.4 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Modern and extensible testing framework License: MIT 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/%{wcwidth}/%{wcwidth}.tar.gz # End cabal-rpm sources # Begin cabal-rpm deps: BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra +BuildRequires: chrpath BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-async-devel BuildRequires: ghc-clock-devel @@ -28,6 +34,7 @@ BuildRequires: ghc-stm-devel BuildRequires: ghc-tagged-devel BuildRequires: ghc-unbounded-delays-devel BuildRequires: ghc-unix-devel +#BuildRequires: ghc-wcwidth-devel # End cabal-rpm deps %description @@ -51,21 +58,33 @@ 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 %{wcwidth} +%endif + +%global version %{main_version} + + %prep # Begin cabal-rpm setup: -%setup -q -n %{pkgver} +%setup -q -n %{pkgver} -a1 # End cabal-rpm setup %build # Begin cabal-rpm build: +%ghc_libs_build %{subpkgs} %ghc_lib_build # End cabal-rpm build %install # Begin cabal-rpm install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} # End cabal-rpm install @@ -88,6 +107,10 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Thu Feb 21 2019 Jens Petersen - 1.1.0.4-1 +- update to 1.1.0.4 +- add wcwidth subpackage + * Sun Feb 17 2019 Jens Petersen - 1.0.1.1-5 - refresh to cabal-rpm-0.13 diff --git a/sources b/sources index 38aa9f1..aa73bc0 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -SHA512 (tasty-1.0.1.1.tar.gz) = 2ab43155f81403e5067707faab2ef3656eea9f9ac9f7f0ca5335e7309844b903b08b9a062d57d14480e1f69e326d349e5129f7d1449708dcd1e1cf4968d8fdc3 +SHA512 (tasty-1.1.0.4.tar.gz) = 1e4814c8e3bd76b8dcd736a14b9fd250d84d2c6c96f3535f59ae89bae229af36fd2ebbf8b57026553cf89cd2c72edcbbbd047e9ed0c7cfc17a8dff1a6edf6a7e +SHA512 (wcwidth-0.0.2.tar.gz) = 555c38183c7c402a66c151e52bbac9e6c501528cd661ad1708576444b6dc4daa19e0d75c9b79f8590843e0e40b3758d9bea08e426e754688cd32070dfce5a649