rpms/happy/devel happy.spec,1.18,1.19

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/happy/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32282

Modified Files:
	happy.spec 
Log Message:
link dynamically again and strip program (cabal2spec-0.21.4)


Index: happy.spec
===================================================================
RCS file: /cvs/extras/rpms/happy/devel/happy.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- happy.spec	23 Jun 2010 10:54:37 -0000	1.18
+++ happy.spec	25 Jun 2010 14:34:59 -0000	1.19
@@ -1,5 +1,5 @@
-# not dynamically linked for bootstrapping ghc
-%bcond_with dynamic
+# need to link statically when building new version of ghc
+%bcond_without dynamic
 
 # ghc does not emit debug information
 %global debug_package %{nil}
@@ -7,15 +7,17 @@
 Name:           happy
 # part of haskell-platform-2010.1.0.0
 Version:        1.18.4
-Release:        7%{?dist}
+Release:        8%{?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)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
-BuildRequires:  ghc, ghc-rpm-macros
+BuildRequires:  ghc
+BuildRequires:  ghc-rpm-macros >= 0.6.0
 BuildRequires:  autoconf, docbook-dtds, docbook-style-xsl, libxslt, libxml2
 BuildRequires:  ghc-mtl-devel
 
@@ -36,7 +38,7 @@ hand-written or generated by another pro
 
 
 %build
-%cabal_configure
+%cabal_configure --ghc
 %cabal build
 
 cd doc
@@ -47,8 +49,11 @@ cd ..
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
 %cabal_install
 
+%ghc_strip_dynlinked
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -62,6 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* 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