diff --git a/.gitignore b/.gitignore index f31ff27..6fa5104 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ /contravariant-0.5.2.tar.gz /contravariant-1.2.tar.gz /contravariant-1.2.0.1.tar.gz +/contravariant-1.4.tar.gz +/StateVar-1.1.0.4.tar.gz diff --git a/ghc-contravariant.spec b/ghc-contravariant.spec index b246541..1d6b95c 100644 --- a/ghc-contravariant.spec +++ b/ghc-contravariant.spec @@ -1,21 +1,28 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name contravariant +%global pkgver %{pkg_name}-%{version} + +%global StateVar StateVar-1.1.0.4 +%global subpkgs %{StateVar} Name: ghc-%{pkg_name} -Version: 1.2.0.1 -Release: 4%{?dist} +Version: 1.4 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Contravariant functors License: BSD Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{StateVar}/%{StateVar}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: +#BuildRequires: ghc-StateVar-devel BuildRequires: ghc-semigroups-devel -BuildRequires: ghc-tagged-devel BuildRequires: ghc-transformers-compat-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-void-devel @@ -37,17 +44,30 @@ 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 %{StateVar} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%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 %ghc_pkg_recache @@ -62,9 +82,14 @@ This package provides the Haskell %{pkg_name} library development files. %files devel -f %{name}-devel.files +%doc CHANGELOG.markdown %changelog +* Thu Feb 23 2017 Jens Petersen - 1.4-1 +- update to 1.4 +- subpkg + * Fri Feb 10 2017 Fedora Release Engineering - 1.2.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index d58ac5e..1302640 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -77086eb6d24ed7e1e837990b9f7ad878 contravariant-1.2.0.1.tar.gz +SHA512 (StateVar-1.1.0.4.tar.gz) = 2d9f958dc2d1b749c5e2b661958cd38b58a1048603dc48a585a2f32ca386cef42db99e39c033194376f6f3de154444841de048dc39804d236f6e10c90c5e3f0b +SHA512 (contravariant-1.4.tar.gz) = 6d99a8ed4694ad8494e1a705e911f16ade01f31c92cc8fc21cf49f5b03beafd25597781abc304c4ee360a3ba9473470a4c96069604ab563fb8ae194e09cdf56a