[darcs] update to 2.8.5

[Jens Petersen]

commit 811bcba5859c8738cdb94c41480fb394421c52cd
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Aug 29 14:06:46 2014 +0900

    update to 2.8.5

 .gitignore                   |    1 +
 darcs-disable-threaded.patch |   11 -----------
 darcs-flags-default.patch    |   21 ++++++---------------
 darcs.spec                   |   18 +++++++++---------
 sources                      |    2 +-
 5 files changed, 17 insertions(+), 36 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ece1e87..ae77c62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ darcs-2.4.4.tar.gz
 /darcs-2.8.2.tar.gz
 /darcs-2.8.3.tar.gz
 /darcs-2.8.4.tar.gz
+/darcs-2.8.5.tar.gz
diff --git a/darcs-flags-default.patch b/darcs-flags-default.patch
index cb8e275..23fefc8 100644
--- a/darcs-flags-default.patch
+++ b/darcs-flags-default.patch
@@ -1,5 +1,5 @@
---- darcs-2.8.3/darcs.cabal~	2012-11-05 03:09:26.000000000 +0900
-+++ darcs-2.8.3/darcs.cabal	2012-11-06 22:42:30.054408269 +0900
+--- darcs-2.8.5/darcs.cabal.orig	2014-08-26 05:27:34.000000000 +0900
++++ darcs-2.8.5/darcs.cabal	2014-08-29 14:01:08.241655179 +0900
 @@ -75,9 +75,11 @@
  
  flag curl
@@ -10,9 +10,9 @@
    description: Use the pure Haskell HTTP package for HTTP support.
 +  default: False
  
- flag static
-   description: Build static binary
-@@ -85,6 +87,7 @@
+ flag network-uri
+   description: Get Network.URI from the network-uri package
+@@ -89,6 +91,7 @@
  
  flag terminfo
    description: Use the terminfo package for enhanced console support.
@@ -20,7 +20,7 @@
  
  flag threaded
    description: Use threading and SMP support.
-@@ -103,6 +106,7 @@
+@@ -107,6 +110,7 @@
  
  flag mmap
    description: Compile with mmap support.
@@ -28,12 +28,3 @@
  
  flag hpc
    default:     False
-@@ -124,7 +128,7 @@
- -- do Unicode translation. Use a flag so we can
- -- detect this situation and use a workaround.
- flag force-char8-encoding
--  default:     False
-+  default:     True
-   description: Allow base 4.5 or above on Unix. base 4.4 introduces a change in
-                the behaviour of filenames that requires API calls in
-                base 4.5 to workaround. So base 4.4 is not supported at all.
diff --git a/darcs.spec b/darcs.spec
index 88bf058..c18c87b 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -9,16 +9,15 @@
 
 # override pkg_name to allow for darcs-beta
 Name:           darcs
-Version:        2.8.4
-Release:        5%{?dist}
+Version:        2.8.5
+Release:        1%{?dist}
 Summary:        Distributed Advanced Revision Control System
 
 License:        GPLv2+
 URL:            http://hackage.haskell.org/package/%{name}
 # pkg_name to allow for darcs-beta
-Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
+Source0:        http://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz
 Patch1:         darcs-flags-default.patch
-Patch2:         darcs-disable-threaded.patch
 
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
@@ -91,13 +90,11 @@ This package provides the Haskell %{name} library development files.
 # make it easier to build darcs-beta
 %setup -q -n %{pkg_name}-%{version}
 %patch1 -p1 -b .orig
+cabal-tweak-flag network-uri False
+cabal-tweak-flag force-char8-encoding True
 %ifnarch %{ix86} x86_64 ppc
-%patch2 -p1 -b .threaded
+cabal-tweak-flag threaded False
 %endif
-cabal-tweak-dep-ver array '< 0.5' '< 0.6'
-cabal-tweak-dep-ver base '< 4.7' '< 4.8'
-cabal-tweak-dep-ver process '< 1.2.0.0' '< 1.3.0.0'
-cabal-tweak-dep-ver unix '< 2.7' '< 2.8'
 
 
 %build
@@ -144,6 +141,9 @@ cp -p contrib/darcs_completion %{buildroot}%{_sysconfdir}/bash_completion.d/darc
 %doc README
 
 %changelog
+* Fri Aug 29 2014 Jens Petersen <petersen at redhat.com> - 2.8.5-1
+- update to 2.8.5
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.8.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index c97788f..f6979f5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7456b7957add1b04c49de1b72c137a77  darcs-2.8.4.tar.gz
+b440e9be53100bf660279ad7c0debf77  darcs-2.8.5.tar.gz