rpms/ghc-GLUT/devel ghc-GLUT-extralibs.patch, NONE, 1.1 ghc-GLUT.spec, 1.8, 1.9
Jens Petersen
petersen at fedoraproject.org
Thu Jun 10 10:19:40 UTC 2010
Author: petersen
Update of /cvs/extras/rpms/ghc-GLUT/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6518
Modified Files:
ghc-GLUT.spec
Added Files:
ghc-GLUT-extralibs.patch
Log Message:
- add extralibs glut in .cabal file to fix ghci linking
(reported by Ian Collier, #601640)
ghc-GLUT-extralibs.patch:
GLUT.cabal | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE ghc-GLUT-extralibs.patch ---
diff -u GLUT-2.1.1.2/GLUT.cabal\~ GLUT-2.1.1.2/GLUT.cabal
--- GLUT-2.1.1.2/GLUT.cabal~ 2008-06-19 21:39:19.000000000 +1000
+++ GLUT-2.1.1.2/GLUT.cabal 2010-06-10 18:03:20.000000000 +1000
@@ -58,3 +58,4 @@
build-depends: base < 3
build-depends: OpenGL >= 2.2
extensions: CPP, ForeignFunctionInterface
+ extra-libraries: glut
Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/devel/ghc-GLUT.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ghc-GLUT.spec 27 Apr 2010 11:11:35 -0000 1.8
+++ ghc-GLUT.spec 10 Jun 2010 10:19:39 -0000 1.9
@@ -17,7 +17,7 @@ This is a set of bindings to the C %{pkg
Name: ghc-%{pkg_name}
# part of haskell-platform-2010.1.0.0
Version: 2.1.2.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -31,6 +31,7 @@ BuildRequires: ghc-doc
BuildRequires: ghc-prof
%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
+Patch1: ghc-GLUT-extralibs.patch
%description
%{common_description}
@@ -44,6 +45,7 @@ This package provides the shared library
%prep
%setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
%build
@@ -64,6 +66,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Jun 10 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-3
+- add extralibs glut in .cabal file to fix ghci linking
+ (reported by Ian Collier, #601640)
+
* Tue Apr 27 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-2
- part of haskell-platform-2010.1.0.0
- rebuild against ghc-6.12.2
More information about the scm-commits
mailing list