[git-annex: 2/2] update flags (network-uri isn't packaged yet)

[Ben Boeckel]

commit a3caaf38013e5ce6c83f38db3843efe6a2a0f5c0
Author: Ben Boeckel <mathstuf at gmail.com>
Date:   Thu Dec 11 00:54:19 2014 -0500

    update flags (network-uri isn't packaged yet)

 git-annex-default-flags.patch |   13 +++++++++++--
 git-annex.spec                |    3 ---
 2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/git-annex-default-flags.patch b/git-annex-default-flags.patch
index 4564576..cfb33c0 100644
--- a/git-annex-default-flags.patch
+++ b/git-annex-default-flags.patch
@@ -1,6 +1,6 @@
 diff -u -r -U5 git-annex-5.20141203/git-annex.cabal git-annex-5.20141203.flags/git-annex.cabal
 --- git-annex-5.20141203/git-annex.cabal	2014-12-03 15:48:21.000000000 -0500
-+++ git-annex-5.20141203.flags/git-annex.cabal	2014-12-11 00:42:01.482148214 -0500
++++ git-annex-5.20141203.flags/git-annex.cabal	2014-12-11 00:52:31.536090629 -0500
 @@ -31,40 +31,51 @@
   to git and transferring them to other computers. The git-annex webapp
   makes it easy to set up and use git-annex this way.
@@ -53,7 +53,7 @@ diff -u -r -U5 git-annex-5.20141203/git-annex.cabal git-annex-5.20141203.flags/g
    Description: Cross building for Android
    Default: False
  
-@@ -72,28 +83,35 @@
+@@ -72,36 +83,43 @@
    Description: Building to get TH splices for Android
    Default: False
  
@@ -89,3 +89,12 @@ diff -u -r -U5 git-annex-5.20141203/git-annex.cabal git-annex-5.20141203.flags/g
    Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
    Default: False
  
+ Flag network-uri
+   Description: Get Network.URI from the network-uri package
+-  Default: True
++  Default: False
+ 
+ Executable git-annex
+   Main-Is: git-annex.hs
+   Build-Depends: MissingH, hslogger, directory, filepath,
+    containers, utf8-string, mtl (>= 2),
diff --git a/git-annex.spec b/git-annex.spec
index d2cd0c5..2265b28 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -22,12 +22,10 @@ BuildRequires:  ghc-SHA-devel
 BuildRequires:  ghc-SafeSemaphore-devel
 BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-async-devel
-BuildRequires:  ghc-aws-devel
 BuildRequires:  ghc-bloomfilter-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-case-insensitive-devel
 BuildRequires:  ghc-conduit-devel
-BuildRequires:  ghc-conduit-extra-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-cryptohash-devel
 BuildRequires:  ghc-data-default-devel
@@ -44,7 +42,6 @@ BuildRequires:  ghc-json-devel
 BuildRequires:  ghc-monad-control-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
-BuildRequires:  ghc-network-uri-devel
 BuildRequires:  ghc-old-locale-devel
 BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-random-devel