[cabal-install] update to 1.18.0.5

[Jens Petersen]

commit 2172611534c2bb744767bfcd5c59bf7736e76f57
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Aug 7 18:38:34 2014 +0200

    update to 1.18.0.5

 .gitignore                              |    1 +
 cabal-install-quieter-selfupgrade.patch |   16 +++++++---------
 cabal-install.spec                      |   25 ++++++++++++++++++++++---
 sources                                 |    3 ++-
 4 files changed, 32 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e8d0cda..c90bfb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ cabal-install-0.8.2.tar.gz
 /cabal-install-0.13.3.tar.gz
 /cabal-install-0.14.0.tar.gz
 /cabal-install-1.16.0.2.tar.gz
+/cabal-install-1.18.0.5.tar.gz
diff --git a/cabal-install-quieter-selfupgrade.patch b/cabal-install-quieter-selfupgrade.patch
index 1d6bcdb..cff380f 100644
--- a/cabal-install-quieter-selfupgrade.patch
+++ b/cabal-install-quieter-selfupgrade.patch
@@ -1,21 +1,19 @@
-diff -up cabal-install-1.16.0.2/Distribution/Client/Update.hs.orig cabal-install-1.16.0.2/Distribution/Client/Update.hs
---- cabal-install-1.16.0.2/Distribution/Client/Update.hs.orig	2013-05-05 05:56:19.000000000 +0900
-+++ cabal-install-1.16.0.2/Distribution/Client/Update.hs	2014-02-06 13:58:52.439678760 +0900
-@@ -29,7 +29,7 @@ import Distribution.Package
+--- cabal-install-1.18.0.4/Distribution/Client/Update.hs~	2014-05-24 15:16:45.000000000 +0900
++++ cabal-install-1.18.0.4/Distribution/Client/Update.hs	2014-06-01 23:29:38.688667487 +0900
+@@ -31,7 +31,7 @@
  import Distribution.Version
           ( anyVersion, withinRange )
  import Distribution.Simple.Utils
--         ( warn, notice, writeFileAtomic )
-+         ( warn, notice, info, writeFileAtomic )
+-         ( writeFileAtomic, warn, notice )
++         ( writeFileAtomic, warn, notice, info )
  import Distribution.Verbosity
           ( Verbosity )
  
-@@ -77,7 +77,7 @@ checkForSelfUpgrade verbosity repos = do
+@@ -80,6 +80,6 @@
          , version `withinRange` preferredVersionRange ]
  
-   when (not (null laterPreferredVersions)) $
+   unless (null laterPreferredVersions) $
 -    notice verbosity $
 +    info verbosity $
           "Note: there is a new version of cabal-install available.\n"
        ++ "To upgrade, run: cabal install cabal-install"
- 
diff --git a/cabal-install.spec b/cabal-install.spec
index 45073bc..abbc188 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -1,9 +1,11 @@
 # https://fedoraproject.org/wiki/Packaging:Haskell
 
+%bcond_with tests
+
 Name:           cabal-install
 # part of haskell-platform
-Version:        1.16.0.2
-Release:        35%{?dist}
+Version:        1.18.0.5
+Release:        1%{?dist}
 Summary:        Command-line interface for Cabal and Hackage
 
 License:        BSD
@@ -17,18 +19,26 @@ BuildRequires:  ghc-rpm-macros
 # Begin cabal-rpm deps:
 BuildRequires:  ghc-HTTP-devel
 BuildRequires:  ghc-array-devel
+BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
-BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-pretty-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-random-devel
+BuildRequires:  ghc-stm-devel
 BuildRequires:  ghc-time-devel
 BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-zlib-devel
+%if %{with tests}
+BuildRequires:  ghc-HUnit-devel
+BuildRequires:  ghc-QuickCheck-devel
+BuildRequires:  ghc-test-framework-devel
+BuildRequires:  ghc-test-framework-hunit-devel
+BuildRequires:  ghc-test-framework-quickcheck2-devel
+%endif
 # End cabal-rpm deps
 Requires:       ghc-compiler
 # for /etc/bash_completion.d/
@@ -61,6 +71,12 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 
+%check
+%if %{with tests}
+%cabal test
+%endif
+
+
 %files
 %doc LICENSE
 %doc README
@@ -70,6 +86,9 @@ install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
 
 %changelog
+* Thu Aug  7 2014 Jens Petersen <petersen at redhat.com> - 1.18.0.5-1
+- update to 1.18.0.5
+
 * Tue Jul  8 2014 Jens Petersen <petersen at redhat.com> - 1.16.0.2-35
 - f21 rebuild
 
diff --git a/sources b/sources
index 0a7c678..1df8bb7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-18e07d5b431d19d94cc5279a5e6fbfee  cabal-install-1.16.0.2.tar.gz
+14c6c09e55334be0e1a90b533177adb3  cabal-install-1.18.0.5.tar.gz
+14c6c09e55334be0e1a90b533177adb3  cabal-install-1.18.0.5.tar.gz