update to 0.11.0.2
Annotation patch should no longer be needed since all archs have ghci
This commit is contained in:
parent
0df863214c
commit
d743d849be
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
|||||||
/optparse-applicative-0.9.0.tar.gz
|
/optparse-applicative-0.9.0.tar.gz
|
||||||
/optparse-applicative-0.10.0.tar.gz
|
/optparse-applicative-0.10.0.tar.gz
|
||||||
/optparse-applicative-0.11.0.1.tar.gz
|
/optparse-applicative-0.11.0.1.tar.gz
|
||||||
|
/optparse-applicative-0.11.0.2.tar.gz
|
||||||
|
@ -2,18 +2,14 @@
|
|||||||
|
|
||||||
%global pkg_name optparse-applicative
|
%global pkg_name optparse-applicative
|
||||||
|
|
||||||
# no useful debuginfo for Haskell packages without C sources
|
|
||||||
%global debug_package %{nil}
|
|
||||||
|
|
||||||
Name: ghc-%{pkg_name}
|
Name: ghc-%{pkg_name}
|
||||||
Version: 0.11.0.1
|
Version: 0.11.0.2
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Utilities and combinators for parsing command line options
|
Summary: Utilities and combinators for parsing command line options
|
||||||
|
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://hackage.haskell.org/package/%{pkg_name}
|
Url: https://hackage.haskell.org/package/%{pkg_name}
|
||||||
Source0: http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
|
Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
|
||||||
Patch0: optparse-applicative-remove-ANN.patch
|
|
||||||
|
|
||||||
BuildRequires: ghc-Cabal-devel
|
BuildRequires: ghc-Cabal-devel
|
||||||
BuildRequires: ghc-rpm-macros
|
BuildRequires: ghc-rpm-macros
|
||||||
@ -42,9 +38,6 @@ files.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{pkg_name}-%{version}
|
%setup -q -n %{pkg_name}-%{version}
|
||||||
%ifnarch %{ghc_arches_with_ghci}
|
|
||||||
%patch0 -p1 -b .orig
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -54,9 +47,7 @@ files.
|
|||||||
%install
|
%install
|
||||||
%ghc_lib_install
|
%ghc_lib_install
|
||||||
|
|
||||||
|
rm %{buildroot}%{ghc_pkgdocdir}/LICENSE
|
||||||
%check
|
|
||||||
# test-suite requires test-framework*
|
|
||||||
|
|
||||||
|
|
||||||
%post devel
|
%post devel
|
||||||
@ -68,7 +59,7 @@ files.
|
|||||||
|
|
||||||
|
|
||||||
%files -f %{name}.files
|
%files -f %{name}.files
|
||||||
%doc LICENSE
|
%license LICENSE
|
||||||
|
|
||||||
|
|
||||||
%files devel -f %{name}-devel.files
|
%files devel -f %{name}-devel.files
|
||||||
@ -76,6 +67,9 @@ files.
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Sep 30 2015 Jens Petersen <petersen@redhat.com> - 0.11.0.2-1
|
||||||
|
- update to 0.11.0.2
|
||||||
|
|
||||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0.1-4
|
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.11.0.1-4
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||||
|
|
||||||
|
@ -1,16 +0,0 @@
|
|||||||
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" #-}
|
|
Loading…
Reference in New Issue
Block a user