[happy/el6/master] update to f14 package

[Jens Petersen]

commit ff01cc8895c7c45448b427ae9bce4bc7023dc0ed
Author: Jens Petersen <petersen at redhat.com>
Date:   Thu Oct 7 13:11:25 2010 +1000

    update to f14 package

 .gitignore |    2 +-
 happy.spec |   53 ++++++++++++++++++++++++++++++++++++++---------------
 sources    |    2 +-
 3 files changed, 40 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3124b54..3524e3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-happy-1.18.4.tar.gz
+happy-1.18.5.tar.gz
diff --git a/happy.spec b/happy.spec
index 0efb060..81ab518 100644
--- a/happy.spec
+++ b/happy.spec
@@ -1,21 +1,25 @@
-# ghc does not emit debug info
-%define debug_package %{nil}
+# need to link statically when building new version of ghc
+%bcond_without dynamic
+
+# ghc does not emit debug information
+%global debug_package %{nil}
 
 Name:           happy
-# part of haskell-platform-2009.2.0.2
-Version:        1.18.4
-Release:        4%{?dist}
+# part of haskell-platform-2010.2.0.0
+Version:        1.18.5
+Release:        1%{?dist}
+Summary:        LALR(1) Parser Generator for Haskell
 License:        BSD
 Group:          Development/Tools
 URL:            http://haskell.org/happy/
 Source:         http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:  ghc, ghc-rpm-macros
-BuildRequires:  autoconf, docbook-dtds, docbook-style-xsl, libxslt, libxml2
-Summary:        LALR(1) Parser Generator for Haskell
 # fedora ghc archs:
-ExclusiveArch:	%{ix86} x86_64 ppc alpha
-Requires(post): policycoreutils
+ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc
+BuildRequires:  ghc-rpm-macros >= 0.7.0
+BuildRequires:  autoconf, docbook-dtds, docbook-style-xsl, libxslt, libxml2
+BuildRequires:  ghc-mtl-devel
 
 %description
 Happy is a parser generator system for Haskell, similar to the tool
@@ -34,19 +38,18 @@ hand-written or generated by another program).
 
 
 %build
-%cabal_configure --ghc
-%cabal build
+%ghc_bin_build
 
-pushd doc
+cd doc
 autoreconf
 %configure
 make html
-popd
+cd ..
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%cabal_install
+%ghc_bin_install
 
 
 %clean
@@ -61,6 +64,26 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 1.18.5-1
+- update to 1.18.5 for haskell-platform-2010.2.0.0
+- use new build macros from ghc-rpm-macros-0.7.0
+
+* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 1.18.4-8
+- link dynamically again
+- strip program (cabal2spec-0.21.4)
+
+* Wed Jun 23 2010 Jens Petersen <petersen at redhat.com> - 1.18.4-7
+- don't link dynamically since happy is needed to build ghc
+
+* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 1.18.4-6
+- rebuild against ghc-6.12.2
+
+* Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 1.18.4-5
+- rebuild with ghc-6.12.1
+- link dynamically
+- buildrequires ghc-mtl-devel
+- drop redundant buildroot and its install cleaning
+
 * Thu Oct  1 2009 Jens Petersen <petersen at redhat.com> - 1.18.4-4
 - selinux fcontext no longer needed in post script
 
diff --git a/sources b/sources
index d68717b..6baeb55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-614e3ef9623dbeefc4c8ca699912efb4  happy-1.18.4.tar.gz
+9e77b67df7b6a4d7273383cc890f39e8  happy-1.18.5.tar.gz