diff --git a/.cvsignore b/.cvsignore
index 2faa119..3c1e341 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-darcs-2.2.1.tar.gz
+darcs-2.4.tar.gz
diff --git a/darcs-2.4-issue458.sh-attr.patch b/darcs-2.4-issue458.sh-attr.patch
new file mode 100644
index 0000000..5e20c94
--- /dev/null
+++ b/darcs-2.4-issue458.sh-attr.patch
@@ -0,0 +1,14 @@
+diff -u darcs-2.4/tests/issue458.sh\~ darcs-2.4/tests/issue458.sh
+--- darcs-2.4/tests/issue458.sh~	2010-02-27 04:10:08.000000000 +1000
++++ darcs-2.4/tests/issue458.sh	2010-03-01 14:52:54.000000000 +1000
+@@ -20,9 +20,7 @@
+ darcs record --repodir repo1 -lam x x
+ umask 077                       # DENY ALL access to group, all
+ darcs get --set-scripts-executable repo1 repo2
+-ls -l repo2/x | cut -f 1 -d\  > mode
+-echo -rwx------ > desired-mode
+-diff -u desired-mode mode
++ls -l repo2/x | cut -f 1 -d\  | grep -- -rwx------
+ 
+ cd ..
+ rm -rf temp
diff --git a/darcs.spec b/darcs.spec
index 72b7c27..695be8f 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -1,94 +1,76 @@
-Name:           darcs
-Version:        2.2.1
-Release:        5%{?dist}
+%global pkg_name darcs
+
+%global common_summary Haskell %{pkg_name} 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.
+
+# Haskell library dependencies:
+%global ghc_pkg_deps ghc-HTTP-devel, ghc-haskeline-devel, ghc-zlib-devel, ghc-hashed-storage-devel, ghc-html-devel, ghc-regex-compat-devel
+
+%bcond_without shared
+
+# debuginfo is not useful for ghc
+%global debug_package %{nil}
+
+Name:           %{pkg_name}
+Version:        2.4
+Release:        1%{?dist}
 Summary:        David's advanced revision control system
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://www.darcs.net/
-Source0:        http://www.darcs.net/%{name}-%{version}.tar.gz
+Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:	%{ix86} x86_64 ppc alpha
-BuildRequires:  ghc
-BuildRequires:  autoconf, sendmail, curl-devel, ncurses-devel, zlib-devel
+BuildRequires:  ghc, ghc-rpm-macros >= 0.5.1
+BuildRequires:  ghc-doc
+BuildRequires:  ghc-prof
+%{?ghc_pkg_deps:BuildRequires:  %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
 # for make check
 BuildRequires:  which
-# for building the manual
-BuildRequires: latex2html
+Patch1:         darcs-2.4-issue458.sh-attr.patch
 
 %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.
-
-%package doc
-Summary: Documentation for David's advanced revision control system
-Group: Documentation
-
-%description doc
-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.
-
-This package contains the darcs manual.
+%{common_description}
 
 
-%package server
-Summary: David's advanced revision control system Server
-Group: Development/Tools
-Requires: webserver, darcs, libxslt
-
-%description server
-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.
-
-This package contains the darcs cgi server program.
+%{?ghc_binlib_package}
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}
+%patch1 -p1 -b .orig
 
 
 %build
-#%%{__autoconf}
-%configure --libexecdir=%{_localstatedir}/www
-make all
+%cabal_configure -p
+%cabal build
+%cabal haddock
 
 
 %check
-make test
+%cabal test
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-# convert text files to utf-8
-for textfile in tools/zsh_completion_new AUTHORS
-do
-    mv -v $textfile $textfile.old
-    iconv --from-code ISO8859-1 --to-code UTF-8 --output $textfile $textfile.old
-    rm -fv $textfile.old
-done 
-make DESTDIR=$RPM_BUILD_ROOT install installserver install-html
+%cabal_install
+%cabal_pkg_conf
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/darcs
+
+%ghc_gen_filelists
 
 
 %clean
@@ -97,27 +79,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc AUTHORS COPYING tools/zsh_completion_*
+%doc COPYING NEWS
 %dir %{_sysconfdir}/bash_completion.d
 %config(noreplace) %{_sysconfdir}/bash_completion.d/darcs
 %{_bindir}/darcs
 %{_mandir}/man1/*
 
 
-%files doc
-%defattr(-,root,root,-)
-%{_docdir}/darcs
-
-
-%files server
-%defattr(-,root,root,-)
-%doc COPYING AUTHORS
-%{_localstatedir}/www/cgi-bin
-%config(noreplace) %{_sysconfdir}/darcs
-%{_datadir}/darcs
-
-
 %changelog
+* Mon Mar  1 2010 Jens Petersen <petersen@redhat.com> - 2.4-1
+- new major upstream version 2.4
+- darcs is now officially a cabal binlib package
+- package with ghc-rpm-macros
+- server (subpackage) is gone
+- add darcs-2.4-issue458.sh-attr.patch to workaround selinux output
+- run check tests again
+- doc and completions file list updates
+
 * Sun Sep 13 2009 Jens Petersen <petersen@redhat.com> - 2.2.1-5
 - rebuild against ghc-6.10.4 which should fix --help hangs
 - improve doc summary (#522899)
diff --git a/sources b/sources
index de863f1..9312c85 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b9255b501b8e71762f6a0c840594a546  darcs-2.2.1.tar.gz
+169a6d245a33da97b2daa0eda60b28e5  darcs-2.4.tar.gz