[git-annex] update to 4.20130827

[Jens Petersen]

commit e4f843d51749f609788db147f864e7f4613d22cc
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Sep 4 12:18:02 2013 +0900

    update to 4.20130827
    
    build with regex-tdfa

 .gitignore                    |    1 +
 git-annex-default-flags.patch |   22 +++++++++++++++++++---
 git-annex.spec                |   22 ++++++++++++++++------
 sources                       |    2 +-
 4 files changed, 37 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4ea0d22..a129815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /git-annex-3.20120615.tar.gz
 /git-annex-3.20121009.tar.gz
 /git-annex-3.20130207.tar.gz
+/git-annex-4.20130827.tar.gz
diff --git a/git-annex-default-flags.patch b/git-annex-default-flags.patch
index b73c4e7..926ae99 100644
--- a/git-annex-default-flags.patch
+++ b/git-annex-default-flags.patch
@@ -1,6 +1,5 @@
-diff -u /home/petersen/fedora/haskell/git-annex/master/git-annex-3.20130207/git-annex.cabal.flags /home/petersen/fedora/haskell/git-annex/master/git-annex-3.20130207/git-annex.cabal
---- git-annex-3.20130207/git-annex.cabal.flags	2013-02-08 03:05:18.000000000 +0900
-+++ git-annex-3.20130207/git-annex.cabal	2013-06-12 18:22:16.230158661 +0900
+--- git-annex-4.20130827/git-annex.cabal~	2013-08-28 05:23:34.000000000 +0900
++++ git-annex-4.20130827/git-annex.cabal	2013-09-04 11:43:32.261880003 +0900
 @@ -27,30 +27,39 @@
  
  Flag S3
@@ -39,5 +38,22 @@ diff -u /home/petersen/fedora/haskell/git-annex/master/git-annex-3.20130207/git-
    Description: Enable the haskell DNS library for DNS lookup
 +  Default: False
  
+ Flag Production
+   Description: Enable production build (slower build; faster binary)
+@@ -61,12 +70,15 @@
+ 
+ Flag TestSuite
+   Description: Embed the test suite into git-annex
++  Default: False
+ 
+ Flag TDFA
+   Description: Use regex-tdfa for wildcards
++  Default: True
+ 
+ Flag Feed
+   Description: Enable podcast feed support
++  Default: False
+ 
  Executable git-annex
    Main-Is: git-annex.hs
+
diff --git a/git-annex.spec b/git-annex.spec
index 0ec140f..cb1f88e 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -3,8 +3,8 @@
 %bcond_without ikiwiki
 
 Name:           git-annex
-Version:        3.20130207
-Release:        2%{?dist}
+Version:        4.20130827
+Release:        1%{?dist}
 Summary:        Manage files with git, without checking their contents into git
 
 License:        GPLv3+
@@ -18,34 +18,39 @@ BuildRequires:  ghc-rpm-macros
 BuildRequires:  ghc-HTTP-devel
 BuildRequires:  ghc-IfElse-devel
 BuildRequires:  ghc-MissingH-devel
+BuildRequires:  ghc-MonadCatchIO-transformers-devel
 BuildRequires:  ghc-QuickCheck-devel
 BuildRequires:  ghc-SHA-devel
 BuildRequires:  ghc-SafeSemaphore-devel
+BuildRequires:  ghc-aeson-devel
 BuildRequires:  ghc-async-devel
 BuildRequires:  ghc-bloomfilter-devel
 BuildRequires:  ghc-bytestring-devel
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-dataenc-devel
 BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-dlist-devel
 BuildRequires:  ghc-edit-distance-devel
 BuildRequires:  ghc-extensible-exceptions-devel
 BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-hinotify-devel
 BuildRequires:  ghc-hslogger-devel
 BuildRequires:  ghc-json-devel
-BuildRequires:  ghc-lifted-base-devel
 BuildRequires:  ghc-monad-control-devel
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-network-devel
 BuildRequires:  ghc-old-locale-devel
-BuildRequires:  ghc-pcre-light-devel
 BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-random-devel
+BuildRequires:  ghc-regex-tdfa-devel
 BuildRequires:  ghc-stm-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-time-devel
-BuildRequires:  ghc-transformers-base-devel
+BuildRequires:  ghc-unix-compat-devel
 BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-utf8-string-devel
+BuildRequires:  ghc-uuid-devel
+# End cabal-rpm deps
 BuildRequires:  git
 %if %{with ikiwiki}
 BuildRequires:  ikiwiki
@@ -58,7 +63,7 @@ Requires:       git
 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, checksumming time, or disk space.
+memory, time, or disk space.
 
 Even without file content tracking, being able to manage files with git, move
 files around and delete files with versioned directory trees, and use branches
@@ -122,6 +127,11 @@ install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
+* Wed Sep 04 2013 Jens Petersen <petersen at redhat.com> - 4.20130827-1
+- update to 4.20130827
+- update deps and default flags
+- build with regex-tdfa
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.20130207-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 574599a..927c35d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bbe1f925d24a973d3a0f2f0afe8dc10b  git-annex-3.20130207.tar.gz
+12b68973c5815e1837a2266d09bfaeb8  git-annex-4.20130827.tar.gz