rpms/ghc-GLUT/F-11 ghc-GLUT.spec,1.1,1.2

[Bryan O'Sullivan]

Author: bos

Update of /cvs/extras/rpms/ghc-GLUT/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv771

Modified Files:
	ghc-GLUT.spec 
Log Message:
Backport Jens's build fix from rawhide


Index: ghc-GLUT.spec
===================================================================
RCS file: /cvs/extras/rpms/ghc-GLUT/F-11/ghc-GLUT.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ghc-GLUT.spec	28 Aug 2009 16:43:08 -0000	1.1
+++ ghc-GLUT.spec	11 Sep 2009 19:25:08 -0000	1.2
@@ -7,8 +7,9 @@
 %global debug_package %{nil}
 
 Name:           ghc-%{pkg_name}
+# part of haskell-platform
 Version:        2.1.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Haskell %{pkg_name} library
 
 Group:          Development/Libraries
@@ -18,12 +19,16 @@ Source0:        http://hackage.haskell.o
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # fedora ghc archs:
 ExclusiveArch:  %{ix86} x86_64 ppc alpha
+BuildRequires:  ghc-OpenGL-devel
+BuildRequires:  freeglut-devel
 BuildRequires:  ghc, ghc-rpm-macros
 %if %{with doc}
 BuildRequires:  ghc-doc
+BuildRequires:  ghc-OpenGL-doc
 %endif
 %if %{with prof}
 BuildRequires:  ghc-prof
+BuildRequires:  ghc-OpenGL-prof
 %endif
 
 %description
@@ -34,10 +39,11 @@ This is a set of bindings to the C %{pkg
 %package devel
 Summary:        Haskell %{pkg_name} library
 Group:          Development/Libraries
-BuildRequires:  ghc-OpenGL-devel, freeglut-devel
-Requires:       ghc = %{ghc_version}, ghc-OpenGL-devel, freeglut-devel
+Requires:       ghc = %{ghc_version}
 Requires(post): ghc = %{ghc_version}
 Requires(preun): ghc = %{ghc_version}
+Requires:       ghc-OpenGL-devel
+Requires:       freeglut-devel
 
 %description devel
 This package contains the development files for %{name}
@@ -48,10 +54,10 @@ built for ghc-%{ghc_version}.
 %package doc
 Summary:        Documentation for %{name}
 Group:          Development/Libraries
-Requires:       ghc-doc = %{ghc_version}, ghc-OpenGL-doc
+Requires:       ghc-doc = %{ghc_version}
 Requires(post): ghc-doc = %{ghc_version}
 Requires(postun): ghc-doc = %{ghc_version}
-BuildRequires:  ghc-OpenGL-doc
+Requires:       ghc-OpenGL-doc
 
 %description doc
 This package contains development documentation files for the %{name} library.
@@ -63,8 +69,8 @@ This package contains development docume
 Summary:        Profiling libraries for %{name}
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
-Requires:       ghc-prof = %{ghc_version}, ghc-OpenGL-prof
-BuildRequires:  ghc-OpenGL-prof
+Requires:       ghc-prof = %{ghc_version}
+Requires:       ghc-OpenGL-prof
 
 %description prof
 This package contains profiling libraries for %{name}
@@ -138,5 +144,8 @@ fi
 
 
 %changelog
+* Mon Aug 31 2009 Jens Petersen <petersen at redhat.com> - 2.1.1.2-2
+- move BRs to source (base) package
+
 * Wed Aug 12 2009 Bryan O'Sullivan <bos at serpentine.com> - 2.1.1.2-1
 - initial packaging for Fedora created by cabal2spec