[ghc-optparse-applicative: 2/2] remove hlint Annotations on archs without ghci
Jens Petersen
petersen at fedoraproject.org
Wed Nov 5 02:00:46 UTC 2014
commit 0ff4897aa7fc1c43970c1996c61c9bf0f6f3c57d
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Nov 5 10:50:55 2014 +0900
remove hlint Annotations on archs without ghci
They don't actually do anything at buildtime other than triggering ghci
and of course silence some hlint noise
ghc-optparse-applicative.spec | 13 +++++++++----
optparse-applicative-remove-ANN.patch | 16 ++++++++++++++++
2 files changed, 25 insertions(+), 4 deletions(-)
---
diff --git a/ghc-optparse-applicative.spec b/ghc-optparse-applicative.spec
index 620769a..9413f9e 100644
--- a/ghc-optparse-applicative.spec
+++ b/ghc-optparse-applicative.spec
@@ -7,24 +7,23 @@
Name: ghc-%{pkg_name}
Version: 0.11.0.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Utilities and combinators for parsing command line options
License: BSD
URL: http://hackage.haskell.org/package/%{pkg_name}
Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
+Patch0: optparse-applicative-remove-ANN.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
# Begin cabal-rpm deps:
BuildRequires: ghc-ansi-wl-pprint-devel
BuildRequires: ghc-process-devel
-BuildRequires: ghc-transformers-devel
BuildRequires: ghc-transformers-compat-devel
+BuildRequires: ghc-transformers-devel
# End cabal-rpm deps
-ExclusiveArch: %{ghc_arches_with_ghci}
-
%description
Utilities and combinators for parsing command line options.
@@ -43,6 +42,9 @@ files.
%prep
%setup -q -n %{pkg_name}-%{version}
+%ifnarch %{ghc_arches_with_ghci}
+%patch0 -p1 -b .orig
+%endif
%build
@@ -74,6 +76,9 @@ files.
%changelog
+* Wed Nov 5 2014 Jens Petersen <petersen at redhat.com> - 0.11.0.1-3
+- disable hlint Annotations on archs without ghci
+
* Tue Nov 4 2014 Ricky Elrod <relrod at redhat.com> - 0.11.0.1-2
- Add ExclusiveArch for GHCi dependency
diff --git a/optparse-applicative-remove-ANN.patch b/optparse-applicative-remove-ANN.patch
new file mode 100644
index 0000000..01b813d
--- /dev/null
+++ b/optparse-applicative-remove-ANN.patch
@@ -0,0 +1,16 @@
+diff -up optparse-applicative-0.11.0.1/Options/Applicative.hs~ optparse-applicative-0.11.0.1/Options/Applicative.hs
+--- optparse-applicative-0.11.0.1/Options/Applicative.hs~ 2014-10-06 02:01:26.000000000 +0900
++++ optparse-applicative-0.11.0.1/Options/Applicative.hs 2014-11-05 10:42:59.741567059 +0900
+@@ -35,4 +35,3 @@ import Options.Applicative.Builder
+ import Options.Applicative.Builder.Completer
+ import Options.Applicative.Extra
+
+-{-# ANN module "HLint: ignore Use import/export shortcut" #-}
+diff -up optparse-applicative-0.11.0.1/Options/Applicative/Help/Core.hs~ optparse-applicative-0.11.0.1/Options/Applicative/Help/Core.hs
+--- optparse-applicative-0.11.0.1/Options/Applicative/Help/Core.hs~ 2014-10-06 02:01:26.000000000 +0900
++++ optparse-applicative-0.11.0.1/Options/Applicative/Help/Core.hs 2014-11-05 10:43:34.110704025 +0900
+@@ -140,4 +140,3 @@ parserUsage pprefs p progn = hsep
+ , string progn
+ , align (extractChunk (briefDesc pprefs p)) ]
+
+-{-# ANN footerHelp "HLint: ignore Eta reduce" #-}
More information about the scm-commits
mailing list