[ghc-OpenGL/f14/master] - ghc-rpm-macros-0.8.1 for doc obsoletes - part of haskell-platform-2010.2.0.0 - add hscolour
Jens Petersen
petersen at fedoraproject.org
Sat Jul 31 13:57:02 UTC 2010
commit 88d87799fc7728e0b69d90d6b0b4991ade013e74
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Jul 31 23:56:27 2010 +1000
- ghc-rpm-macros-0.8.1 for doc obsoletes
- part of haskell-platform-2010.2.0.0
- add hscolour
ghc-OpenGL.spec | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 deletions(-)
---
diff --git a/ghc-OpenGL.spec b/ghc-OpenGL.spec
index a80fc5b..4ac6d38 100644
--- a/ghc-OpenGL.spec
+++ b/ghc-OpenGL.spec
@@ -7,14 +7,15 @@
%global ghc_pkg_c_deps mesa-libGL-devel, mesa-libGLU-devel
%bcond_without shared
+%bcond_without hscolour
# debuginfo is not useful for ghc
%global debug_package %{nil}
Name: ghc-%{pkg_name}
-# part of haskell-platform-2010.1.0.0
+# part of haskell-platform-2010.2.0.0
Version: 2.2.3.0
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -25,7 +26,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
BuildRequires: ghc, ghc-doc, ghc-prof
-BuildRequires: ghc-rpm-macros >= 0.7.0
+BuildRequires: ghc-rpm-macros >= 0.8.1
+%if %{with hscolour}
+BuildRequires: hscolour
+%endif
%{?ghc_pkg_c_deps:BuildRequires: %{ghc_pkg_c_deps}}
%description
@@ -35,9 +39,6 @@ This package provides the shared library.
%endif
-%{?ghc_lib_package}
-
-
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -55,7 +56,15 @@ rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
+%ghc_lib_package -o 2.2.3.0-4
+
+
%changelog
+* Sat Jul 31 2010 Jens Petersen <petersen at redhat.com> - 2.2.3.0-4
+- ghc-rpm-macros-0.8.1 for doc obsoletes
+- part of haskell-platform-2010.2.0.0
+- add hscolour
+
* Sat Jun 26 2010 Jens Petersen <petersen at redhat.com> - 2.2.3.0-3
- sync cabal2spec-0.22
More information about the scm-commits
mailing list