[darcs/f18] backport 2.8.3 from f19 rawhide to build on all archs

Wed Dec 12 07:08:41 UTC 2012

commit 26502cd33b5e92945b7c776c2458380399eb5de5
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Dec 12 16:08:26 2012 +0900

    backport 2.8.3 from f19 rawhide to build on all archs
    
    f18 tar is still 0.3

 .gitignore                   |    1 +
 darcs-disable-threaded.patch |   11 ++++++
 darcs-flags-default.patch    |   39 ++++++++++++++++++++++
 darcs.spec                   |   73 ++++++++++++++++++++++--------------------
 sources                      |    2 +-
 5 files changed, 90 insertions(+), 36 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3ca357f..950e316 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ darcs-2.4.4.tar.gz
 /darcs-2.8.0.tar.gz
 /darcs-2.8.1.tar.gz
 /darcs-2.8.2.tar.gz
+/darcs-2.8.3.tar.gz
diff --git a/darcs-disable-threaded.patch b/darcs-disable-threaded.patch
new file mode 100644
index 0000000..32701e0
--- /dev/null
+++ b/darcs-disable-threaded.patch
@@ -0,0 +1,11 @@
+--- darcs-2.8.3/darcs.cabal~	2012-11-06 22:50:48.512735857 +0900
++++ darcs-2.8.3/darcs.cabal	2012-11-06 22:51:26.815683844 +0900
+@@ -91,7 +91,7 @@
+ 
+ flag threaded
+   description: Use threading and SMP support.
+-  default:     True
++  default:     False
+ 
+ flag library
+   description: Build darcs library
diff --git a/darcs-flags-default.patch b/darcs-flags-default.patch
new file mode 100644
index 0000000..cb8e275
--- /dev/null
+++ b/darcs-flags-default.patch
@@ -0,0 +1,39 @@
+--- 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
+@@ -75,9 +75,11 @@
+ 
+ flag curl
+   description: Use libcurl for HTTP support.
++  default: True
+ 
+ flag http
+   description: Use the pure Haskell HTTP package for HTTP support.
++  default: False
+ 
+ flag static
+   description: Build static binary
+@@ -85,6 +87,7 @@
+ 
+ flag terminfo
+   description: Use the terminfo package for enhanced console support.
++  default: True
+ 
+ flag threaded
+   description: Use threading and SMP support.
+@@ -103,6 +106,7 @@
+ 
+ flag mmap
+   description: Compile with mmap support.
++  default: True
+ 
+ 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 8822c7c..d40f32f 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25.2
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -9,50 +8,54 @@
 
 %global common_summary Haskell darcs library
 
-%global common_description Darcs is a revision control system, along the lines of CVS\
-or arch. That means that it keeps track of various revisions\
-and branches of your project, allows for changes to\
-propagate from one branch to another. Darcs is intended to\
-be an ``advanced'' revision control system. Darcs has two\
-particularly distinctive features which differ from other\
-revision control systems: 1) each copy of the source is a\
-fully functional branch, and 2) underlying darcs is a\
-consistent and powerful theory of patches.
-
-# needs cmdlib, shellish, test-framework*
-%bcond_with tests
+%global common_description Darcs is a distributed, interactive, smart revision control system.\
+Darcs is easy to learn and efficient to use because it asks you questions\
+in response to simple commands, giving you choices in your workflow.\
+You can choose to record one change in a file, while ignoring another.\
+You can review each patch as you update from upstream.\
+Originally developed by physicist David Roundy,\
+darcs is based on a unique algebra of patches.
 
 # override pkg_name to allow for darcs-beta
 Name:           darcs
-Version:        2.8.2
-Release:        2%{?dist}
-Summary:        David's Advanced Revision Control System
+Version:        2.8.3
+Release:        1%{?dist}
+Summary:        Distributed Advanced Revision Control System
 
-Group:          Development/Tools
 License:        GPLv2+
-# BEGIN cabal2spec
 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
-ExclusiveArch:  %{ghc_arches_with_ghci}
+Patch1:         darcs-flags-default.patch
+Patch2:         darcs-disable-threaded.patch
+
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
-# END cabal2spec
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
+BuildRequires:  ghc-array-devel
+BuildRequires:  ghc-bytestring-devel
+BuildRequires:  ghc-containers-devel
+BuildRequires:  ghc-directory-devel
+BuildRequires:  ghc-extensible-exceptions-devel
+BuildRequires:  ghc-filepath-devel
 BuildRequires:  ghc-hashed-storage-devel
 BuildRequires:  ghc-haskeline-devel
-BuildRequires:  ghc-haskell98-devel
 BuildRequires:  ghc-html-devel
+BuildRequires:  ghc-mmap-devel
+BuildRequires:  ghc-mtl-devel
+BuildRequires:  ghc-old-time-devel
 BuildRequires:  ghc-parsec-devel
+BuildRequires:  ghc-process-devel
 BuildRequires:  ghc-random-devel
 BuildRequires:  ghc-regex-compat-devel
 BuildRequires:  ghc-tar-devel
+BuildRequires:  ghc-terminfo-devel
 BuildRequires:  ghc-text-devel
+BuildRequires:  ghc-unix-devel
 BuildRequires:  ghc-vector-devel
 BuildRequires:  ghc-zlib-devel
+# End cabal-rpm deps
 BuildRequires:  curl-devel
-%if %{with tests}
-BuildRequires:  which
-%endif
 Obsoletes:      darcs-server < 2.2.1-6
 
 %description
@@ -62,22 +65,16 @@ Obsoletes:      darcs-server < 2.2.1-6
 %prep
 # make it easier to build darcs-beta
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
+%ifnarch %{ix86} x86_64 ppc
+%patch2 -p1 -b .threaded
+%endif
 
 
 %build
-%if %{with tests}
-%define cabal_configure_options -ftest
-%endif
 %ghc_lib_build
 
 
-%if %{with tests}
-%check
-dist/build/unit/unit
-%cabal test
-%endif
-
-
 %install
 %ghc_lib_install
 
@@ -113,6 +110,12 @@ Obsoletes: ghc-darcs%{!?beta:-beta}-devel < %{version}-%{release}
 
 
 %changelog
+* Wed Dec 12 2012 Jens Petersen <petersen at redhat.com> - 2.8.3-1
+- refresh description
+- patch flags and turn on terminfo
+- disable threaded on tier 2 archs
+- rip out old conditional running of tests
+
 * Tue Sep 18 2012 Jens Petersen <petersen at redhat.com> - 2.8.2-2
 - make the manpage world readable (#857999)
 
diff --git a/sources b/sources
index 1e68df8..71b949f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-148edc46b70c3b12c19d65d4f75cafaf  darcs-2.8.2.tar.gz
+c7791978473da2c41fe47513eecc38c2  darcs-2.8.3.tar.gz
