diff --git a/.gitignore b/.gitignore index 209c3eb..b3f5202 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ hlint-1.7.3.tar.gz /hlint-1.8.50.tar.gz /hlint-1.9.4.tar.gz /hlint-1.9.10.tar.gz +/hlint-1.9.41.tar.gz diff --git a/hlint.spec b/hlint.spec index 6566c05..34eab1b 100644 --- a/hlint.spec +++ b/hlint.spec @@ -1,28 +1,42 @@ +# generated by cabal-rpm-0.11.1 # https://fedoraproject.org/wiki/Packaging:Haskell %global pkg_name hlint +%global pkgver %{pkg_name}-%{version} + +%global clock clock-0.7.2 +%global extra extra-1.5.1 +%global refact refact-0.3.0.2 +%global subpkgs %{clock} %{extra} %{refact} Name: %{pkg_name} -Version: 1.9.10 -Release: 5%{?dist} +Version: 1.9.41 +# can only be reset when all subpkgs bumped +Release: 1%{?dist} Summary: Haskell source code suggestions License: BSD Url: https://hackage.haskell.org/package/%{name} -Source0: https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz -Patch0: hlint-1.9.10-build-fixes.patch +Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz +Source1: https://hackage.haskell.org/package/%{extra}/%{extra}.tar.gz +Source2: https://hackage.haskell.org/package/%{refact}/%{refact}.tar.gz +Source3: https://hackage.haskell.org/package/%{clock}/%{clock}.tar.gz BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-rpm-macros +BuildRequires: ghc-rpm-macros-extra # Begin cabal-rpm deps: +BuildRequires: chrpath +BuildRequires: ghc-ansi-terminal-devel BuildRequires: ghc-cmdargs-devel BuildRequires: ghc-containers-devel BuildRequires: ghc-cpphs-devel BuildRequires: ghc-directory-devel +#BuildRequires: ghc-extra-devel BuildRequires: ghc-filepath-devel BuildRequires: ghc-haskell-src-exts-devel BuildRequires: ghc-hscolour-devel BuildRequires: ghc-process-devel +#BuildRequires: ghc-refact-devel BuildRequires: ghc-transformers-devel BuildRequires: ghc-uniplate-devel # End cabal-rpm deps @@ -50,18 +64,32 @@ Requires: ghc-%{name}%{?_isa} = %{version}-%{release} This package provides the Haskell %{name} library development files. +%global main_version %{version} + +%if %{defined ghclibdir} +%ghc_lib_subpackage %{clock} +%ghc_lib_subpackage %{extra} +%ghc_lib_subpackage %{refact} +%endif + +%global version %{main_version} + + %prep -%setup -q -%patch0 -p1 -b .orig +%setup -q -a1 -a2 -a3 %build +%ghc_libs_build %{subpkgs} %ghc_lib_build %install +%ghc_libs_install %{subpkgs} %ghc_lib_install +%ghc_fix_rpath %{pkgver} %{subpkgs} + mkdir -p %{buildroot}%{_mandir}/man1 mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man1 @@ -76,7 +104,7 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man %files %license LICENSE -%doc README.md +%doc CHANGES.txt README.md %{_bindir}/%{name} %{_datadir}/%{name}-%{version} %{_mandir}/man1/%{name}* @@ -90,6 +118,9 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man %changelog +* Thu Feb 23 2017 Jens Petersen - 1.9.41-1 +- update to 1.9.41 + * Fri Feb 10 2017 Fedora Release Engineering - 1.9.10-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index e327e70..09cde3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -811f8480fa524f8febb63741bdcee5c1 hlint-1.9.10.tar.gz +SHA512 (hlint-1.9.41.tar.gz) = 085de82dc6bb33de3364bd632f089b7a683c442e4a6c65c9ada8edeb56261ae4bf36d4500b95e71be73de94021e85c1a7112d0d5d946c8df23103fb8f19de0b9