diff --git a/.gitignore b/.gitignore index b3d6476..f3832bf 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /data-default-0.4.0.tar.gz /data-default-0.5.0.tar.gz /data-default-0.5.1.tar.gz +/data-default-0.7.1.1.tar.gz diff --git a/ghc-data-default.spec b/ghc-data-default.spec index aedd95a..d23517c 100644 --- a/ghc-data-default.spec +++ b/ghc-data-default.spec @@ -1,22 +1,32 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name data-default +%global pkgver %{pkg_name}-%{version} + +%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 Name: ghc-%{pkg_name} -Version: 0.5.1 -Release: 9%{?dist} +Version: 0.7.1.1 +Release: 1%{?dist} Summary: A class for types with a default value 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/%{instancescontainers}/%{instancescontainers}.tar.gz +Source2: https://hackage.haskell.org/package/%{instancesdlist}/%{instancesdlist}.tar.gz +Source3: https://hackage.haskell.org/package/%{instancesoldlocale}/%{instancesoldlocale}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros # Begin cabal-rpm deps: -BuildRequires: ghc-containers-devel -BuildRequires: ghc-dlist-devel -BuildRequires: ghc-old-locale-devel +BuildRequires: ghc-data-default-class-devel +#BuildRequires: ghc-data-default-instances-containers-devel +#BuildRequires: ghc-data-default-instances-dlist-devel +#BuildRequires: ghc-data-default-instances-old-locale-devel # End cabal-rpm deps %description @@ -35,15 +45,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 %{instancescontainers} +%ghc_lib_subpackage %{instancesdlist} +%ghc_lib_subpackage %{instancesoldlocale} +%endif + +%global version %{main_version} + + %prep -%setup -q -n %{pkg_name}-%{version} +%setup -q -n %{pkgver} -a1 -a2 -a3 %build +%ghc_libs_build %{instancescontainers} %{instancesdlist} %{instancesoldlocale} %ghc_lib_build %install +%ghc_libs_install %{instancescontainers} %{instancesdlist} %{instancesoldlocale} %ghc_lib_install @@ -63,6 +86,9 @@ This package provides the Haskell %{pkg_name} library development files. %changelog +* Tue Feb 21 2017 Jens Petersen - 0.7.1.1-1 +- update to 0.7.1.1 + * Fri Feb 10 2017 Fedora Release Engineering - 0.5.1-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index d64cd1c..cdc44a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba3529294b809824948d40f1fcd56d89 data-default-0.5.1.tar.gz +SHA512 (data-default-0.7.1.1.tar.gz) = a31260c71178641e41f16fc504620f19ad04a44d2d095c96225b6027184c01ec0bf47effab5344816e438d7c37e34189255a9d3a5d643219b37054dde679d1bd