From 8e498d3903218f8042a4db7c2084ce0cd9aedd9d Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Jun 06 2016 09:26:53 +0000
Subject: update to 1.22.6.0


This reverts commit 660bf37775662869aa70ebd4a8887b4f247f4eb3.

---

diff --git a/.gitignore b/.gitignore
index 9b72cad..08ee958 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ cabal-install-0.8.2.tar.gz
 /cabal-install-1.18.0.5.tar.gz
 /cabal-install-1.18.0.8.tar.gz
 /cabal-install-1.18.1.0.tar.gz
+/cabal-install-1.22.6.0.tar.gz
diff --git a/cabal-install-no-network-uri.patch b/cabal-install-no-network-uri.patch
deleted file mode 100644
index eb68f6b..0000000
--- a/cabal-install-no-network-uri.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cabal-install-1.18.0.8/cabal-install.cabal~	2015-03-25 18:13:31.448000000 +0900
-+++ cabal-install-1.18.0.8/cabal-install.cabal	2015-03-25 18:15:52.029000000 +0900
-@@ -144,7 +144,7 @@
-     if flag(network-uri)
-       build-depends: network-uri >= 2.6, network >= 2.6
-     else
--      build-depends: network-uri < 2.6, network < 2.6
-+      build-depends: network < 2.6
- 
-     if os(windows)
-       build-depends: Win32 >= 2 && < 3
-@@ -198,7 +198,7 @@
-   if flag(network-uri)
-     build-depends: network-uri >= 2.6, network >= 2.6
-   else
--    build-depends: network-uri < 2.6, network < 2.6
-+    build-depends: network < 2.6
- 
-   if os(windows)
-     build-depends: Win32
diff --git a/cabal-install-quieter-selfupgrade.patch b/cabal-install-quieter-selfupgrade.patch
deleted file mode 100644
index cff380f..0000000
--- a/cabal-install-quieter-selfupgrade.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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
--         ( writeFileAtomic, warn, notice )
-+         ( writeFileAtomic, warn, notice, info )
- import Distribution.Verbosity
-          ( Verbosity )
- 
-@@ -80,6 +80,6 @@
-         , version `withinRange` preferredVersionRange ]
- 
-   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 6a7f192..7da86eb 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -7,16 +7,14 @@
 
 Name:           cabal-install
 # part of haskell-platform
-Version:        1.18.1.0
-Release:        3%{?dist}
+Version:        1.22.6.0
+Release:        1%{?dist}
 Summary:        Command-line interface for Cabal and Hackage
 
 License:        BSD
-URL:            http://hackage.haskell.org/package/%{name}
-Source0:        http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Url:            https://hackage.haskell.org/package/%{name}
+Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
 Source1:        cabal-install.sh
-Patch0:         cabal-install-quieter-selfupgrade.patch
-Patch1:         cabal-install-no-network-uri.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -29,6 +27,7 @@ BuildRequires:  ghc-directory-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
+BuildRequires:  ghc-network-uri-devel
 BuildRequires:  ghc-pretty-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-random-devel
@@ -39,6 +38,8 @@ BuildRequires:  ghc-zlib-devel
 %if %{with tests}
 BuildRequires:  ghc-HUnit-devel
 BuildRequires:  ghc-QuickCheck-devel
+BuildRequires:  ghc-extensible-exceptions-devel
+BuildRequires:  ghc-regex-posix-devel
 BuildRequires:  ghc-test-framework-devel
 BuildRequires:  ghc-test-framework-hunit-devel
 BuildRequires:  ghc-test-framework-quickcheck2-devel
@@ -83,10 +84,6 @@ This provides a build with Haskell libraries statically linked.
 
 %prep
 %setup -q
-%patch0 -p1 -b .orig
-%patch1 -p1 -b .orig
-
-cabal-tweak-flag network-uri False
 
 
 %build
@@ -168,7 +165,8 @@ fi
 %ghost %{_bindir}/%{binname}
 %{_bindir}/%{binname}.dynamic
 %else
-%doc LICENSE README
+%license LICENSE
+%doc README.md
 %{_bindir}/cabal
 %config(noreplace) %{_sysconfdir}/bash_completion.d/cabal
 %config(noreplace) %{_sysconfdir}/profile.d/cabal-install.sh
@@ -177,7 +175,8 @@ fi
 
 %if %{with static}
 %files common
-%doc LICENSE README
+%license LICENSE
+%doc README.md
 %config(noreplace) %{_sysconfdir}/bash_completion.d/cabal
 %config(noreplace) %{_sysconfdir}/profile.d/cabal-install.sh
 
@@ -189,6 +188,9 @@ fi
 
 
 %changelog
+* Mon Jun  6 2016 Jens Petersen <petersen@redhat.com> - 1.22.6.0-1
+- update to 1.22.6.0
+
 * Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.1.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 
diff --git a/sources b/sources
index 0a3087b..3660273 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-770006873e1de2acda9c264ff5147bd8  cabal-install-1.18.1.0.tar.gz
+0463650044697ea337705ea9e29a0221  cabal-install-1.22.6.0.tar.gz