[curry] fix build using iso8859-1 encoding for ghc7
Jens Petersen
petersen at fedoraproject.org
Mon Mar 5 06:58:43 UTC 2012
commit 5b88203ffab844bf01fa980320658e4f50b599e1
Author: Jens Petersen <petersen at redhat.com>
Date: Mon Mar 5 15:58:26 2012 +0900
fix build using iso8859-1 encoding for ghc7
- BR ghc-haskell98-devel instead of ghc
curry.spec | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/curry.spec b/curry.spec
index 50f9f8a..22fc3ab 100644
--- a/curry.spec
+++ b/curry.spec
@@ -1,6 +1,6 @@
Name: curry
Version: 0.9.11
-Release: 10%{?dist}.2
+Release: 11%{?dist}
Summary: Münster Curry compiler
Group: Development/Languages
@@ -8,10 +8,10 @@ License: BSD
URL: http://danae.uni-muenster.de/~lux/curry
Source: http://danae.uni-muenster.de/~lux/curry/download/curry-0.9.11/curry-0.9.11.tar.gz
Patch0: curry-strip.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: ghc >= 6.4
+BuildRequires: ghc-haskell98-devel
Requires: gcc
ExcludeArch: ppc64 alpha
+Patch1: curry-0.9.11-parser-iso8859.patch
%description
The Münster Curry compiler is a native code compiler for the
@@ -21,25 +21,21 @@ declarative multi-paradigm language Curry.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1 -b .orig
%build
%configure
# _smp_mflags breaks the build
-make
+# curry/{Parser,Trace}.curry are ISO-8859
+LANG=en_US.ISO8859-1 make
%install
-rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%files
-%defattr(-,root,root,-)
%doc LICENSE README NEWS doc/report.pdf doc/user.pdf
%{_bindir}/*
%{_libdir}/curry-%{version}
@@ -47,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Mar 5 2012 Jens Petersen <petersen at redhat.com> - 0.9.11-11
+- BR ghc-haskell98-devel instead of ghc
+- compile with iso8859-1 encoding to build with ghc7
+
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.11-10.2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list