From 15a16e92b1542ca7bfdf37e4413f19a3f145f070 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mar 24 2013 13:03:53 +0000
Subject: and revert back to darcs-2.8.4 again for haskeline-0.7 support...


Reverting "use cabal-tweak-dep-ver to bump tar and haskeline"
Reverting "bump for rebuild"
Reverting "Revert back to 2.8.3 since haddock fails on 2.8.4"

This reverts commit 83bd265ed4ef4ec59120205238a93f7eb3e89154.

---

diff --git a/.gitignore b/.gitignore
index 950e316..ece1e87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ darcs-2.4.4.tar.gz
 /darcs-2.8.1.tar.gz
 /darcs-2.8.2.tar.gz
 /darcs-2.8.3.tar.gz
+/darcs-2.8.4.tar.gz
diff --git a/darcs-tar-0.4.patch b/darcs-tar-0.4.patch
deleted file mode 100644
index a6d64d6..0000000
--- a/darcs-tar-0.4.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -up darcs-2.8.3/src/Darcs/Repository.hs~ darcs-2.8.3/src/Darcs/Repository.hs
---- darcs-2.8.3/src/Darcs/Repository.hs~	2012-11-08 13:46:34.932474444 +0900
-+++ darcs-2.8.3/src/Darcs/Repository.hs	2012-11-08 15:04:35.209765141 +0900
-@@ -302,19 +302,19 @@ removeMetaFiles :: IO ()
- removeMetaFiles = mapM_ (removeFile . (darcsdir </>)) .
-   filter ("meta-" `isPrefixOf`) =<< getDirectoryContents darcsdir
- 
--unpackBasic :: Cache -> Tar.Entries -> IO ()
-+unpackBasic :: Cache -> Tar.Entries Tar.FormatError -> IO ()
- unpackBasic c x = do
-   withControlMVar $ \mv -> unpackTar c (basicMetaHandler c mv) x
-   removeMetaFiles
- 
--unpackPatches :: Cache -> [String] -> Tar.Entries -> IO ()
-+unpackPatches :: Cache -> [String] -> Tar.Entries Tar.FormatError -> IO ()
- unpackPatches c ps x = do
-   withControlMVar $ \mv -> unpackTar c (patchesMetaHandler c ps mv) x
-   removeMetaFiles
- 
--unpackTar :: Cache -> IO () -> Tar.Entries -> IO ()
-+unpackTar :: Cache -> IO () -> Tar.Entries Tar.FormatError -> IO ()
- unpackTar  _ _ Tar.Done = return ()
--unpackTar  _ _ (Tar.Fail e)= fail e
-+unpackTar  _ _ (Tar.Fail e)= (fail . show) e
- unpackTar c mh (Tar.Next x xs) = case Tar.entryContent x of
-   Tar.NormalFile x' _ -> do
-     let p = Tar.entryPath x
diff --git a/darcs.spec b/darcs.spec
index c04c60b..cfa80ce 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -18,8 +18,8 @@ darcs is based on a unique algebra of patches.
 
 # override pkg_name to allow for darcs-beta
 Name:           darcs
-Version:        2.8.3
-Release:        3%{?dist}
+Version:        2.8.4
+Release:        1%{?dist}
 Summary:        Distributed Advanced Revision Control System
 
 License:        GPLv2+
@@ -28,7 +28,6 @@ URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 Patch1:         darcs-flags-default.patch
 Patch2:         darcs-disable-threaded.patch
-Patch3:         darcs-tar-0.4.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -53,6 +52,7 @@ BuildRequires:  ghc-tar-devel
 BuildRequires:  ghc-terminfo-devel
 BuildRequires:  ghc-text-devel
 BuildRequires:  ghc-unix-devel
+BuildRequires:  ghc-utf8-string-devel
 BuildRequires:  ghc-vector-devel
 BuildRequires:  ghc-zlib-devel
 BuildRequires:  libcurl-devel%{?_isa}
@@ -70,10 +70,6 @@ Obsoletes:      darcs-server < 2.2.1-6
 %ifnarch %{ix86} x86_64 ppc
 %patch2 -p1 -b .threaded
 %endif
-%patch3 -p1 -b .tar
-
-cabal-tweak-dep-ver tar "== 0.3.*" "== 0.4.*"
-cabal-tweak-dep-ver haskeline "< 0.7" "< 0.8"
 
 
 %build
@@ -115,9 +111,9 @@ Obsoletes: ghc-darcs%{!?beta:-beta}-devel < %{version}-%{release}
 
 
 %changelog
-* Fri Mar 22 2013 Jens Petersen <petersen@redhat.com> - 2.8.3-3
+* Tue Mar 19 2013 Jens Petersen <petersen@redhat.com> - 2.8.4-1
+- update to 2.8.4
 - libcurl-devel no longer provides curl-devel
-- allow haskeline-0.7
 
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.8.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
diff --git a/sources b/sources
index 71b949f..c97788f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c7791978473da2c41fe47513eecc38c2  darcs-2.8.3.tar.gz
+7456b7957add1b04c49de1b72c137a77  darcs-2.8.4.tar.gz