update to 2.1.5, and refact is now in Fedora

This commit is contained in:
Jens Petersen 2018-05-28 11:41:47 +09:00
parent 0f9394bcf1
commit 64fa65abf8
3 changed files with 12 additions and 25 deletions

1
.gitignore vendored
View File

@ -23,3 +23,4 @@ hlint-1.7.3.tar.gz
/extra-1.5.1.tar.gz
/hlint-2.0.9.tar.gz
/hlint-2.0.11.tar.gz
/hlint-2.1.5.tar.gz

View File

@ -1,25 +1,20 @@
# generated by cabal-rpm-0.12.1
# generated by cabal-rpm-0.12.3
# https://fedoraproject.org/wiki/Packaging:Haskell
%global pkg_name hlint
%global pkgver %{pkg_name}-%{version}
%global refact refact-0.3.0.2
%global subpkgs %{refact}
Name: %{pkg_name}
Version: 2.0.11
# can only be reset when all subpkgs bumped
Release: 8%{?dist}
Version: 2.1.5
Release: 1%{?dist}
Summary: Haskell source code suggestions
License: BSD
Url: https://hackage.haskell.org/package/%{name}
Source0: https://hackage.haskell.org/package/%{pkgver}/%{pkgver}.tar.gz
Source1: https://hackage.haskell.org/package/%{refact}/%{refact}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: chrpath
BuildRequires: ghc-aeson-devel
@ -36,7 +31,7 @@ BuildRequires: ghc-haskell-src-exts-devel
BuildRequires: ghc-haskell-src-exts-util-devel
BuildRequires: ghc-hscolour-devel
BuildRequires: ghc-process-devel
#BuildRequires: ghc-refact-devel
BuildRequires: ghc-refact-devel
BuildRequires: ghc-text-devel
BuildRequires: ghc-transformers-devel
BuildRequires: ghc-uniplate-devel
@ -71,26 +66,15 @@ 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 %{refact}
%endif
%global version %{main_version}
%prep
%setup -q -a1
%setup -q
%build
%ghc_libs_build %{subpkgs}
%ghc_lib_build
%install
%ghc_libs_install %{subpkgs}
%ghc_lib_install
%ghc_fix_rpath %{pkgver}
mv %{buildroot}%{_ghclicensedir}/{,ghc-}%{name}
@ -108,7 +92,6 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man
%files
%license LICENSE
%doc CHANGES.txt README.md
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
@ -123,6 +106,10 @@ mv %{buildroot}%{_datadir}/%{name}-%{version}/hlint.1 %{buildroot}%{_mandir}/man
%changelog
* Mon May 28 2018 Jens Petersen <petersen@redhat.com> - 2.1.5-1
- update to 2.1.5
- refact is now packaged
* Tue Apr 10 2018 Jens Petersen <petersen@redhat.com> - 2.0.11-8
- datadir should be in ghc-hlint (#1564707)

View File

@ -1,2 +1 @@
SHA512 (hlint-2.0.11.tar.gz) = 4a7737864ddbcdc0e90f175514b67d77ad9ac96510fc23e16c98340099d64c1b2274f5d0f145f1ac867bf883d81600aeabd2ee2704c2de3cb7c913aa9626c7c9
SHA512 (refact-0.3.0.2.tar.gz) = 18f35a3f563288815645c4ef8e557a08bd9038aca0b3d9af391f9f71b39bbf779b725f037fa682a23e38e31cf7b8e0f4ae412e2af2ec3639c4b2c47a05a45a6e
SHA512 (hlint-2.1.5.tar.gz) = 24d5af8928f72648fa9e0679f8cf0c654b5e5442be15375dcfd4d40a9f1dda522c122d56df7061ae8e843d38421affa566c0ab4b272d1726895f3e6cc7576c38