petersen pushed to cabal-install (f22). "update to 1.18.0.8"

[notifications at fedoraproject.org]

>From 1a02f8613623ff9d2178e797c2a8f21a1b415072 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Thu, 2 Apr 2015 18:16:25 +0900
Subject: update to 1.18.0.8


diff --git a/cabal-install-no-network-uri.patch b/cabal-install-no-network-uri.patch
new file mode 100644
index 0000000..eb68f6b
--- /dev/null
+++ b/cabal-install-no-network-uri.patch
@@ -0,0 +1,20 @@
+--- 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.spec b/cabal-install.spec
index c8c0144..8929c80 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -7,7 +7,7 @@
 
 Name:           cabal-install
 # part of haskell-platform
-Version:        1.18.0.5
+Version:        1.18.0.8
 Release:        1%{?dist}
 Summary:        Command-line interface for Cabal and Hackage
 
@@ -16,6 +16,7 @@ URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://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
@@ -83,6 +84,9 @@ 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
@@ -185,6 +189,9 @@ fi
 
 
 %changelog
+* Thu Apr  2 2015 Jens Petersen <petersen at redhat.com> - 1.18.0.8-1
+- update to 1.18.0.8
+
 * Thu Aug  7 2014 Jens Petersen <petersen at redhat.com> - 1.18.0.5-1
 - update to 1.18.0.5
 - obsolete cabal-dev
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cabal-install.git/commit/?h=f22&id=1a02f8613623ff9d2178e797c2a8f21a1b415072