From 5c98f06c17e02fe1ddf7be465dae90c28b2540eb Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Mon, 29 Oct 2012 19:07:01 +0900
Subject: [PATCH] update to 0.10 with cabal-rpm; disable building testprog in
 .cabal

---
 .gitignore                     |  1 +
 cmdargs-disable-testprog.patch | 11 +++++++++++
 ghc-cmdargs.spec               | 29 ++++++++++++++++-------------
 sources                        |  2 +-
 4 files changed, 29 insertions(+), 14 deletions(-)
 create mode 100644 cmdargs-disable-testprog.patch

diff --git a/.gitignore b/.gitignore
index 6a0a69c..e21bd01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /cmdargs-0.8.tar.gz
 /cmdargs-0.9.3.tar.gz
 /cmdargs-0.9.5.tar.gz
+/cmdargs-0.10.tar.gz
diff --git a/cmdargs-disable-testprog.patch b/cmdargs-disable-testprog.patch
new file mode 100644
index 0000000..77b2c3a
--- /dev/null
+++ b/cmdargs-disable-testprog.patch
@@ -0,0 +1,11 @@
+--- cmdargs-0.10/cmdargs.cabal~	2012-08-10 02:28:16.000000000 +0900
++++ cmdargs-0.10/cmdargs.cabal	2012-10-29 19:00:33.682629521 +0900
+@@ -38,7 +38,7 @@
+     location: http://community.haskell.org/~ndm/darcs/cmdargs/
+ 
+ flag testprog
+-    default: True
++    default: False
+     description: Build the test program
+ 
+ flag quotation
diff --git a/ghc-cmdargs.spec b/ghc-cmdargs.spec
index c0dfed9..6701c39 100644
--- a/ghc-cmdargs.spec
+++ b/ghc-cmdargs.spec
@@ -1,4 +1,3 @@
-# cabal2spec-0.25
 # https://fedoraproject.org/wiki/Packaging:Haskell
 # https://fedoraproject.org/wiki/PackagingDrafts/Haskell
 
@@ -10,20 +9,24 @@
 parsers.
 
 Name:           ghc-%{pkg_name}
-Version:        0.9.5
-Release:        3%{?dist}
+Version:        0.10
+Release:        1%{?dist}
 Summary:        %{common_summary}
 
-Group:          System Environment/Libraries
 License:        BSD
-# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{pkg_name}
 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 %{!?without_hscolour:hscolour}
-# END cabal2spec
+BuildRequires:  ghc-rpm-macros
+# Begin cabal-rpm deps:
+BuildRequires:  ghc-filepath-devel
+BuildRequires:  ghc-process-devel
+BuildRequires:  ghc-template-haskell-devel
 BuildRequires:  ghc-transformers-devel
+ExclusiveArch:  %{ghc_arches_with_ghci}
+# End cabal-rpm deps
+Patch1:         cmdargs-disable-testprog.patch
 
 %description
 %{common_description}
@@ -31,21 +34,17 @@ BuildRequires:  ghc-transformers-devel
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
 
 
 %build
-# dynamic linking of test program failing
-%define ghc_without_dynamic 1
 %ghc_lib_build
 
 
 %install
 %ghc_lib_install
-# Remove the demo program
-rm -vf %{buildroot}/%{_bindir}/%{pkg_name}
 
 
-# devel subpackage
 %ghc_devel_package
 
 %ghc_devel_description
@@ -58,6 +57,10 @@ rm -vf %{buildroot}/%{_bindir}/%{pkg_name}
 
 
 %changelog
+* Mon Oct 29 2012 Jens Petersen <petersen@redhat.com> - 0.10-1
+- update to 0.10 with cabal-rpm
+- disable building testprog in .cabal
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.5-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index 74271e3..71d422f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5648d85e1e030123d851d527b2014096  cmdargs-0.9.5.tar.gz
+4fbcfdbca06e29012fb0bc26e73ceb56  cmdargs-0.10.tar.gz