[git-annex] update to 5.20140221, update build flags patch

[Jens Petersen]

commit 9c83f9136ab9eda5258f2b358e229cc844ad1687
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Feb 25 10:22:21 2014 +0900

    update to 5.20140221, update build flags patch

 .gitignore                    |    1 +
 git-annex-default-flags.patch |   27 +++++++++++++++++++++------
 git-annex.spec                |   11 ++++++++---
 sources                       |    2 +-
 4 files changed, 31 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48b4db2..03b0559 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@
 /git-annex-4.20130827.tar.gz
 /git-annex-5.20140108.tar.gz
 /git-annex-5.20140116.tar.gz
+/git-annex-5.20140221.tar.gz
diff --git a/git-annex-default-flags.patch b/git-annex-default-flags.patch
index c8641ae..8b9f00a 100644
--- a/git-annex-default-flags.patch
+++ b/git-annex-default-flags.patch
@@ -1,7 +1,6 @@
-diff -u /home/petersen/fedora/haskell/git-annex/master/git-annex-5.20140108/git-annex.cabal.flags /home/petersen/fedora/haskell/git-annex/master/git-annex-5.20140108/git-annex.cabal
---- git-annex-5.20140108/git-annex.cabal.flags	2014-01-09 01:46:06.000000000 +0900
-+++ git-annex-5.20140108/git-annex.cabal	2014-01-14 13:26:05.502459406 +0900
-@@ -27,30 +27,39 @@
+--- git-annex-5.20140221/git-annex.cabal.flags	2014-02-22 01:07:15.000000000 +0900
++++ git-annex-5.20140221/git-annex.cabal	2014-02-25 10:14:54.001768026 +0900
+@@ -27,33 +27,43 @@
  
  Flag S3
    Description: Enable S3 support
@@ -41,7 +40,11 @@ diff -u /home/petersen/fedora/haskell/git-annex/master/git-annex-5.20140108/git-
  
  Flag Production
    Description: Enable production build (slower build; faster binary)
-@@ -65,12 +74,15 @@
++  Default: True
+ 
+ Flag Android
+   Description: Cross building for Android
+@@ -65,21 +75,27 @@
  
  Flag TestSuite
    Description: Embed the test suite into git-annex
@@ -53,7 +56,19 @@ diff -u /home/petersen/fedora/haskell/git-annex/master/git-annex-5.20140108/git-
  
  Flag Feed
    Description: Enable podcast feed support
-+  Default: True
++  Default: False
  
  Flag Quvi
    Description: Enable use of quvi to download videos
++  Default: True
+ 
+ Flag Tahoe
+   Description: Enable the tahoe special remote
++  Default: True
+ 
+ Flag CryptoHash
+   Description: Enable use of cryptohash for checksumming
++  Default: True
+ 
+ Flag EKG
+   Description: Enable use of EKG to monitor git-annex as it runs (at http://localhost:4242/)
diff --git a/git-annex.spec b/git-annex.spec
index 8f686e6..aaa3d7f 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,13 +3,13 @@
 %bcond_without ikiwiki
 
 Name:           git-annex
-Version:        5.20140116
+Version:        5.20140221
 Release:        1%{?dist}
 Summary:        Manage files with git, without checking their contents into git
 
 License:        GPLv3+
 URL:            http://hackage.haskell.org/package/%{name}
-Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0:        http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
 Patch0:         git-annex-default-flags.patch
 
 BuildRequires:  ghc-Cabal-devel
@@ -27,6 +27,7 @@ BuildRequires:  ghc-async-devel
 BuildRequires:  ghc-bloomfilter-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-cryptohash-devel
 BuildRequires:  ghc-dataenc-devel
 BuildRequires:  ghc-dbus-devel
 BuildRequires:  ghc-directory-devel
@@ -61,7 +62,7 @@ BuildRequires:  perl(Image::Magick)
 Requires:       git
 
 %description
-git-annex allows managing files with git, without checking the file contents
+Git-annex allows managing files with git, without checking the file contents
 into git. While that may seem paradoxical, it is useful when dealing with files
 larger than git can currently easily handle, whether due to limitations in
 memory, time, or disk space.
@@ -128,6 +129,10 @@ install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Tue Feb 25 2014 Jens Petersen <petersen at redhat.com> - 5.20140221-1
+- update to 5.20140221
+- BR cryptohash
+
 * Fri Feb 07 2014 Jens Petersen <petersen at redhat.com> - 5.20140116-1
 - update to 5.20140116
 
diff --git a/sources b/sources
index 8447551..d14f882 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbd120e00d3de487d2d5e05f02abb9ab  git-annex-5.20140116.tar.gz
+befc8a51050497086cff9924e3817b1e  git-annex-5.20140221.tar.gz