- rel 5; m4 macro fix from upstream

Changed files:
    ghc-build.patch -> 1.1
    ghc.spec -> 1.116

diff --git a/ghc-build.patch b/ghc-build.patch
new file mode 100644 (file)
index 0000000..92f2335
--- /dev/null
+++ b/ghc-build.patch
@@ -0,0 +1,11 @@
+--- ghc-6.12.3/aclocal.m4~     2011-02-27 11:48:59.360195820 +0100
++++ ghc-6.12.3/aclocal.m4      2011-02-27 12:02:13.969509541 +0100
+@@ -123,7 +123,7 @@
+ # A variation of AC_CHECK_SIZEOF for computing the alignment restrictions of a
+ # given type. Defines ALIGNMENT_TYPE.
+ AC_DEFUN([FP_CHECK_ALIGNMENT],
+-[AS_LITERAL_IF([$1], [],
++[AS_LITERAL_IF(m4_translit([[$1]], [*], [p]), [],
+                [AC_FATAL([$0: requires literal arguments])])[]dnl
+ AC_CHECK_TYPE([$1], [], [], [$3])[]dnl
+ m4_pushdef([fp_Cache], [AS_TR_SH([fp_cv_alignment_$1])])[]dnl

diff --git a/ghc.spec b/ghc.spec
index 5577ed8180aaddfd726de0455689b24e14713290..215045c142386137f666a8d00b8358353397a359 100644 (file)
--- a/ghc.spec
+++ b/ghc.spec
@@ -16,7 +16,7 @@ Summary:      Glasgow Haskell Compilation system
 Summary(pl.UTF-8):     System kompilacji Glasgow Haskell
 Name:          ghc
 Version:       6.12.3
-Release:       4
+Release:       5
 License:       BSD-like w/o adv. clause
 Group:         Development/Languages
 Source0:       http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-src.tar.bz2
@@ -29,6 +29,7 @@ Source4:      http://darcs.haskell.org/download/dist/%{version}/%{name}-%{version}-x8
 %endif
 Patch0:                %{name}-pld.patch
 Patch1:                %{name}-pkgdir.patch
+Patch2:                %{name}-build.patch
 URL:           http://haskell.org/ghc/
 BuildRequires: OpenAL-devel
 BuildRequires: OpenGL-GLU-devel
@@ -128,6 +129,7 @@ mv %{name}-%{version} binsrc
 %endif
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__autoconf}