[git-annex] update git-annex-no-ifelse.patch for 3.20120615

[Jens Petersen]

commit 67a48304f72c0870e1b3ac153e7714f0a7c79f6b
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Jun 26 11:57:41 2012 +0900

    update git-annex-no-ifelse.patch for 3.20120615
    
    seems Group field is no longer mandatory for fedora rpms

 git-annex-no-ifelse.patch |   29 +++++++++++++++--------------
 git-annex.spec            |    4 ++--
 2 files changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/git-annex-no-ifelse.patch b/git-annex-no-ifelse.patch
index 7b95e17..0ccb77d 100644
--- a/git-annex-no-ifelse.patch
+++ b/git-annex-no-ifelse.patch
@@ -20,10 +20,10 @@ diff -u -r -U5 -N git-annex-3.20120522/Common.hs git-annex-3.20120522.no-ifelse/
 +import Utility.Conditional as X
  
  import Utility.PartialPrelude as X
-diff -u -r -U5 -N git-annex-3.20120522/git-annex.cabal git-annex-3.20120522.no-ifelse/git-annex.cabal
---- git-annex-3.20120522/git-annex.cabal	2012-05-22 11:28:26.000000000 -0400
-+++ git-annex-3.20120522.no-ifelse/git-annex.cabal	2012-06-02 09:46:02.857169451 -0400
-@@ -33,11 +33,11 @@
+diff -u -U5 git-annex-3.20120615/git-annex.cabal\~ git-annex-3.20120615/git-annex.cabal
+--- git-annex-3.20120615/git-annex.cabal~	2012-06-16 03:16:42.000000000 +0900
++++ git-annex-3.20120615/git-annex.cabal	2012-06-26 11:48:55.587149118 +0900
+@@ -32,11 +32,11 @@
    Main-Is: git-annex.hs
    Build-Depends: MissingH, hslogger, directory, filepath,
     unix, containers, utf8-string, network, mtl, bytestring, old-locale, time,
@@ -31,11 +31,11 @@ diff -u -r -U5 -N git-annex-3.20120522/git-annex.cabal git-annex-3.20120522.no-i
     base == 4.5.*, monad-control, transformers-base, lifted-base,
 -   IfElse, text, QuickCheck >= 2.1, bloomfilter, edit-distance
 +   text, QuickCheck >= 2.1, bloomfilter, edit-distance
+   -- Need to list this because it's generated from a .hsc file.
    Other-Modules: Utility.Touch
    C-Sources: Utility/libdiskfree.c
    Extensions: CPP
  
-   if flag(S3)
 diff -u -r -U5 -N git-annex-3.20120522/Utility/Conditional.hs git-annex-3.20120522.no-ifelse/Utility/Conditional.hs
 --- git-annex-3.20120522/Utility/Conditional.hs	1969-12-31 19:00:00.000000000 -0500
 +++ git-annex-3.20120522.no-ifelse/Utility/Conditional.hs	2012-06-02 09:44:55.942168737 -0400
@@ -56,10 +56,10 @@ diff -u -r -U5 -N git-annex-3.20120522/Utility/Conditional.hs git-annex-3.201205
 +
 +unlessM :: Monad m => m Bool -> m () -> m ()
 +unlessM c a = c >>= flip unless a
-diff -u -r -U5 -N git-annex-3.20120522/Utility/Directory.hs git-annex-3.20120522.no-ifelse/Utility/Directory.hs
---- git-annex-3.20120522/Utility/Directory.hs	2012-05-22 11:28:26.000000000 -0400
-+++ git-annex-3.20120522.no-ifelse/Utility/Directory.hs	2012-06-02 09:45:33.002169133 -0400
-@@ -10,21 +10,21 @@
+diff -u -U5 git-annex-3.20120615/Utility/Directory.hs\~ git-annex-3.20120615/Utility/Directory.hs
+--- git-annex-3.20120615/Utility/Directory.hs~	2012-06-16 03:16:42.000000000 +0900
++++ git-annex-3.20120615/Utility/Directory.hs	2012-06-26 11:48:55.587149118 +0900
+@@ -10,11 +10,10 @@
  import System.IO.Error
  import System.Posix.Files
  import System.Directory
@@ -70,7 +70,8 @@ diff -u -r -U5 -N git-annex-3.20120522/Utility/Directory.hs git-annex-3.20120522
  import Control.Applicative
  import Control.Exception (bracket_)
  import System.Posix.Directory
- 
+ import System.IO.Unsafe (unsafeInterleaveIO)
+@@ -22,10 +21,11 @@
  import Utility.SafeCommand
  import Utility.TempFile
  import Utility.Exception
@@ -78,7 +79,7 @@ diff -u -r -U5 -N git-annex-3.20120522/Utility/Directory.hs git-annex-3.20120522
  import Utility.Path
 +import Utility.Conditional
  
- {- Lists the contents of a directory.
-  - Unlike getDirectoryContents, paths are not relative to the directory. -}
- dirContents :: FilePath -> IO [FilePath]
- dirContents d = map (d </>) . filter notcruft <$> getDirectoryContents d
+ dirCruft :: FilePath -> Bool
+ dirCruft "." = True
+ dirCruft ".." = True
+ dirCruft _ = False
diff --git a/git-annex.spec b/git-annex.spec
index 6d9f879..ad39924 100644
--- a/git-annex.spec
+++ b/git-annex.spec
@@ -77,7 +77,7 @@ store.
 %if %{with docs}
 %package docs
 Summary:        %{summary}
-Group:          documentation
+Group:          Documentation
 
 %description docs
 This package contains the documentation for %{name} in HTML format.
@@ -114,7 +114,7 @@ install -m 0644 git-annex-shell.1 %{buildroot}%{_mandir}/man1
 
 %if %{with docs}
 %files docs
-%doc GPL html/
+%doc html/
 %endif