rpms/ghc-GLUT/F-12 ghc-GLUT-extralibs.patch, NONE, 1.1 ghc-GLUT.spec, 1.5, 1.6

[Jens Petersen]

Author: petersen

Update of /cvs/extras/rpms/ghc-GLUT/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9507

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/F-12/ghc-GLUT.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ghc-GLUT.spec	14 Sep 2009 02:19:21 -0000	1.5
+++ ghc-GLUT.spec	10 Jun 2010 11:00:39 -0000	1.6
@@ -9,7 +9,7 @@
 Name:           ghc-%{pkg_name}
 # part of haskell-platform-2009.2.0.2
 Version:        2.1.1.2
-Release:        2%{?dist}
+Release:        2.1%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -30,6 +30,7 @@ BuildRequires:  ghc-OpenGL-doc
 BuildRequires:  ghc-prof
 BuildRequires:  ghc-OpenGL-prof
 %endif
+Patch1:         ghc-GLUT-extralibs.patch
 
 %description
 This package provides the Haskell %{pkg_name} library for ghc.
@@ -80,6 +81,7 @@ built for ghc-%{ghc_version}.
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
 
 
 %build
@@ -144,6 +146,10 @@ fi
 
 
 %changelog
+* Thu Jun 10 2010 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2.1
+- add extralibs glut in .cabal file to fix ghci linking
+  (reported by Ian Collier, #601640)
+
 * Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2
 - move BRs to source (base) package