From 48cc6cdb52785c436c7bb17f0be9eac1f46e6411 Mon Sep 17 00:00:00 2001
From: Elliott Sales de Andrade <quantum.analyst@gmail.com>
Date: Sep 29 2017 09:11:15 +0000
Subject: Update to 6.20160511.


---

diff --git a/.gitignore b/.gitignore
index 12de8c6..7124753 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@
 /git-annex-5.20140717.tar.gz
 /git-annex-5.20150812.tar.gz
 /git-annex-6.20160419.tar.gz
+/git-annex-6.20160511.tar.gz
diff --git a/git-annex-6.20160511-flags.patch b/git-annex-6.20160511-flags.patch
new file mode 100644
index 0000000..95ceba7
--- /dev/null
+++ b/git-annex-6.20160511-flags.patch
@@ -0,0 +1,66 @@
+--- git-annex-6.20160419/git-annex.cabal.orig	2016-04-25 23:49:12.342433405 -0400
++++ git-annex-6.20160419/git-annex.cabal	2016-04-26 00:09:03.870091223 -0400
+@@ -33,21 +33,27 @@ Description:
+ 
+ Flag S3
+   Description: Enable S3 support
++  Default: True
+ 
+ Flag WebDAV
+   Description: Enable WebDAV support
++  Default: True
+ 
+ Flag Assistant
+   Description: Enable git-annex assistant and watch command
++  Default: True
+ 
+ Flag Webapp
+   Description: Enable git-annex webapp
++  Default: True
+ 
+ Flag Pairing
+   Description: Enable pairing
++  Default: True
+ 
+ Flag Production
+   Description: Enable production build (slower build; faster binary)
++  Default: True
+ 
+ Flag Android
+   Description: Cross building for Android
+@@ -59,15 +65,19 @@ Flag AndroidSplice
+ 
+ Flag TestSuite
+   Description: Embed the test suite into git-annex
++  Default: False
+ 
+ Flag TorrentParser
+   Description: Use haskell torrent library to parse torrent files
++  Default: True
+ 
+ Flag MagicMime
+   Description: Use libmagic to determine file MIME types
++  Default: True
+ 
+ Flag ConcurrentOutput
+   Description: Use concurrent-output library
++  Default: True
+ 
+ Flag EKG
+   Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
+@@ -83,12 +93,15 @@ Flag network-uri
+ 
+ Flag Cryptonite
+   Description: Use the cryptonite library, instead of the older cryptohash
++  Default: True
+ 
+ Flag Dbus
+   Description: Enable dbus support
++  Default: True
+ 
+ Flag XMPP
+   Description: Enable notifications using XMPP
++  Default: True
+ 
+ Executable git-annex
+   Main-Is: git-annex.hs
diff --git a/git-annex.spec b/git-annex.spec
index 873fc89..c3a006a 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,13 +3,14 @@
 %bcond_without ikiwiki
 
 Name:           git-annex
-Version:        6.20160419
-Release:        6%{?dist}
+Version:        6.20160511
+Release:        1%{?dist}
 Summary:        Manage files with git, without checking their contents into git
 
 License:        GPLv3+
 Url:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
+Patch0:         git-annex-6.20160511-flags.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -160,7 +161,7 @@ This package contains the documentation for %{name} in HTML format.
 
 %prep
 %setup -q
-cabal-tweak-flag TestSuite False
+%patch0 -p1 -b .flags
 
 
 %build
@@ -196,6 +197,10 @@ make git-annex.1 git-annex-shell.1
 
 
 %changelog
+* Fri May 13 2016 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 6.20160511-1
+- update to 6.20160511
+- switch back to flag patching, which doesn't confuse cabal-rpm as much
+
 * Thu May 05 2016 Elliott Sales de Andrade <quantum.analyst@gmail.com> - 6.20160419-6
 - Enable S3, WebDAV, and Torrent support
 
diff --git a/sources b/sources
index 6efdfca..b75e44f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (git-annex-6.20160419.tar.gz) = b8b250b700aaaa336ee85af3d053d893b422e2bf427dc0f1f38689b49a2a74fa240a725da09d98f5bdf86d35d68612765c0de878de52ae4ddbb8908fb32ad118
+SHA512 (git-annex-6.20160511.tar.gz) = cf5789a3700e98bbc2bf74a6f9227f21487b0415eb0b95a81e951726b54cf481d7bb7c8ef19607ef9780ad8e86df0e9e00aac04684687522e0ecc85687da215f