[darcs] update to cabal2spec-0.25.2; drop Cabal-1.8 manpage workaround; patch for regex-compat-0.95.1

[Jens Petersen]

commit 278c880e2471da7880312c3a211e5905735c6ba4
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jan 6 17:35:11 2012 +0900

    update to cabal2spec-0.25.2; drop Cabal-1.8 manpage workaround; patch for regex-compat-0.95.1

 darcs-2.5.2-regex-compat-0.95.patch |   41 ++++++++++++++++++++++++
 darcs.spec                          |   59 +++++++++++++++++++++++++---------
 2 files changed, 84 insertions(+), 16 deletions(-)
---
diff --git a/darcs-2.5.2-regex-compat-0.95.patch b/darcs-2.5.2-regex-compat-0.95.patch
new file mode 100644
index 0000000..b41dcb4
--- /dev/null
+++ b/darcs-2.5.2-regex-compat-0.95.patch
@@ -0,0 +1,41 @@
+diff -u darcs-2.5.2/darcs.cabal\~ darcs-2.5.2/darcs.cabal
+--- darcs-2.5.2/darcs.cabal~	2011-03-14 07:40:47.000000000 +0900
++++ darcs-2.5.2/darcs.cabal	2012-01-06 17:21:44.936360344 +0900
+@@ -170,7 +170,7 @@
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71 && < 0.96,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+@@ -375,7 +375,7 @@
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71 && < 0.96,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+@@ -523,7 +523,7 @@
+ 
+   build-depends:   base          < 5,
+                    extensible-exceptions >= 0.1 && < 0.2,
+-                   regex-compat >= 0.71 && < 0.94,
++                   regex-compat >= 0.71 && < 0.96,
+                    mtl          >= 1.0 && < 2.1,
+                    parsec       >= 2.0 && < 3.2,
+                    html         == 1.0.*,
+@@ -619,7 +619,7 @@
+ 
+     build-depends:   base          < 5,
+                      extensible-exceptions >= 0.1 && < 0.2,
+-                     regex-compat >= 0.71 && < 0.94,
++                     regex-compat >= 0.71 && < 0.96,
+                      mtl          >= 1.0 && < 2.1,
+                      parsec       >= 2.0 && < 3.2,
+                      html         == 1.0.*,
+
+Diff finished.  Fri Jan  6 17:21:48 2012
diff --git a/darcs.spec b/darcs.spec
index b1928d4..294c486 100644
--- a/darcs.spec
+++ b/darcs.spec
@@ -1,3 +1,7 @@
+# cabal2spec-0.25.2
+# https://fedoraproject.org/wiki/Packaging:Haskell
+# https://fedoraproject.org/wiki/PackagingDrafts/Haskell
+
 %global pkg_name darcs
 
 %global common_summary Haskell %{pkg_name} library
@@ -12,35 +16,40 @@ 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.
 
-%global ghc_pkg_c_deps curl-devel
-
 %bcond_with tests
 
 # override pkg_name to allow for darcs-beta
 Name:           darcs
 Version:        2.5.2
-Release:        7%{?dist}.2
+Release:        8%{?dist}
 Summary:        David's Advanced Revision Control System
 
 Group:          Development/Tools
 License:        GPLv2+
-URL:            http://www.darcs.net/
-# use pkg_name to allow for darcs-beta
-Source0:        http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
 # 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}
 BuildRequires:  ghc-Cabal-devel
-BuildRequires:  ghc-rpm-macros
-%if %{undefined without_hscolour}
-BuildRequires:  hscolour
-%endif
+BuildRequires:  ghc-rpm-macros %{!?without_hscolour:hscolour}
 # END cabal2spec
-BuildRequires:  ghc-hashed-storage-prof, ghc-haskeline-prof, ghc-haskell98-prof, ghc-html-prof, ghc-parsec-prof, ghc-random-prof, ghc-regex-compat-prof, ghc-tar-prof, ghc-text-prof, ghc-zlib-prof
-%{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+BuildRequires:  ghc-hashed-storage-prof
+BuildRequires:  ghc-haskeline-prof
+BuildRequires:  ghc-haskell98-prof
+BuildRequires:  ghc-html-prof
+BuildRequires:  ghc-parsec-prof
+BuildRequires:  ghc-random-prof
+BuildRequires:  ghc-regex-compat-prof
+BuildRequires:  ghc-tar-prof
+BuildRequires:  ghc-text-prof
+BuildRequires:  ghc-zlib-prof
+BuildRequires:  curl-devel
 %if %{with tests}
 BuildRequires:  which
 %endif
 Obsoletes:      darcs-server < 2.2.1-6
+Patch1:         darcs-2.5.2-regex-compat-0.95.patch
 
 %description
 %{common_description}
@@ -49,7 +58,7 @@ 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
 
 %build
 %ghc_lib_build
@@ -68,7 +77,18 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/darcs
 
 
-%ghc_binlib_package
+%ghc_package
+
+%ghc_description
+
+
+%ghc_devel_package
+Requires:  curl-devel
+
+%ghc_devel_description
+
+
+%ghc_devel_post_postun
 
 
 %files
@@ -76,11 +96,18 @@ cp -p contrib/darcs_completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/d
 %dir %{_sysconfdir}/bash_completion.d
 %config(noreplace) %{_sysconfdir}/bash_completion.d/darcs
 %{_bindir}/darcs
-# workaround Cabal-1.8 bug (http://hackage.haskell.org/trac/hackage/ticket/641)
-%attr(644,root,root) %{_mandir}/man1/darcs.1*
+%{_mandir}/man1/darcs.1*
+
+
+%ghc_files
 
 
 %changelog
+* Fri Jan  6 2012 Jens Petersen <petersen at redhat.com> - 2.5.2-8
+- update to cabal2spec-0.25.2
+- drop Cabal-1.8 workaround for manpage permission issue
+- patch .cabal for regex-compat-0.95.1 in haskell-platform-2011.4
+
 * Tue Oct 25 2011 Jens Petersen <petersen at redhat.com> - 2.5.2-7.2
 - minor package cleanup closer to cabal2spec-0.24.1