From 5c1daa1aea1d05e76ce9e516c3931ffcf4da39c1 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Tue, 2 Feb 2016 00:16:29 +0900 Subject: [PATCH] Reverting "update to 0.11.0.2" This reverts commit d743d849be05d3c525b069bd834f62115a48796c. --- .gitignore | 1 - ghc-optparse-applicative.spec | 24 +++++++++++++++--------- optparse-applicative-remove-ANN.patch | 16 ++++++++++++++++ sources | 2 +- 4 files changed, 32 insertions(+), 11 deletions(-) create mode 100644 optparse-applicative-remove-ANN.patch diff --git a/.gitignore b/.gitignore index 1f0f2ac..cce144e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,3 @@ /optparse-applicative-0.9.0.tar.gz /optparse-applicative-0.10.0.tar.gz /optparse-applicative-0.11.0.1.tar.gz -/optparse-applicative-0.11.0.2.tar.gz diff --git a/ghc-optparse-applicative.spec b/ghc-optparse-applicative.spec index f751d74..1908153 100644 --- a/ghc-optparse-applicative.spec +++ b/ghc-optparse-applicative.spec @@ -2,14 +2,18 @@ %global pkg_name optparse-applicative +# no useful debuginfo for Haskell packages without C sources +%global debug_package %{nil} + Name: ghc-%{pkg_name} -Version: 0.11.0.2 -Release: 1%{?dist} +Version: 0.11.0.1 +Release: 4%{?dist} Summary: Utilities and combinators for parsing command line options License: BSD -Url: https://hackage.haskell.org/package/%{pkg_name} -Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz +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 @@ -38,6 +42,9 @@ files. %prep %setup -q -n %{pkg_name}-%{version} +%ifnarch %{ghc_arches_with_ghci} +%patch0 -p1 -b .orig +%endif %build @@ -47,7 +54,9 @@ files. %install %ghc_lib_install -rm %{buildroot}%{ghc_pkgdocdir}/LICENSE + +%check +# test-suite requires test-framework* %post devel @@ -59,7 +68,7 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %files -f %{name}.files -%license LICENSE +%doc LICENSE %files devel -f %{name}-devel.files @@ -67,9 +76,6 @@ rm %{buildroot}%{ghc_pkgdocdir}/LICENSE %changelog -* Wed Sep 30 2015 Jens Petersen - 0.11.0.2-1 -- update to 0.11.0.2 - * Wed Jun 17 2015 Fedora Release Engineering - 0.11.0.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 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" #-} diff --git a/sources b/sources index b2cd5bd..2a0ea82 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fad194dc48581e65fc31f9e8402a9bdd optparse-applicative-0.11.0.2.tar.gz +f11885a62175815d20d53698aebaa850 optparse-applicative-0.11.0.1.tar.gz