rpms/ghc-GLUT/F-13 ghc-GLUT-extralibs.patch, NONE, 1.1 ghc-GLUT.spec, 1.7, 1.8

[Jens Petersen]

Author: petersen

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

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-13/ghc-GLUT.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ghc-GLUT.spec	11 Jan 2010 05:31:08 -0000	1.7
+++ ghc-GLUT.spec	10 Jun 2010 10:39:12 -0000	1.8
@@ -15,9 +15,9 @@ This is a set of bindings to the C %{pkg
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
-# part of haskell-platform-2009.3.1
+# part of haskell-platform-2010.1.0.0
 Version:        2.1.2.1
-Release:        1%{?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}
@@ -39,11 +40,12 @@ This package provides the shared library
 %endif
 
 
-%ghc_lib_package
+%{?ghc_lib_package}
 
 
 %prep
 %setup -q -n %{pkg_name}-%{version}
+%patch1 -p1 -b .orig
 
 
 %build
@@ -64,6 +66,14 @@ 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
+- condition ghc_lib_package
+
 * Mon Jan 11 2010 Jens Petersen <petersen at redhat.com> - 2.1.2.1-1
 - update to 2.1.2.1 (haskell-platform-2009.3.1)
 - update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1: