[ghc-ghc-paths] ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2)
Jens Petersen
petersen at fedoraproject.org
Sat Sep 4 12:05:14 UTC 2010
commit 3a5e5b94aa57fcdf5fc131aa35df919c64ba55a6
Author: Jens Petersen <petersen at redhat.com>
Date: Sat Sep 4 22:05:13 2010 +1000
ghc-rpm-macros-0.8.1: add hscolour and doc obsolete (cabal2spec-0.22.2)
ghc-ghc-paths.spec | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
---
diff --git a/ghc-ghc-paths.spec b/ghc-ghc-paths.spec
index 74198b9..95ec842 100644
--- a/ghc-ghc-paths.spec
+++ b/ghc-ghc-paths.spec
@@ -5,13 +5,14 @@
%global common_description Knowledge of GHC's installation directories.
%bcond_without shared
+%bcond_without hscolour
# debuginfo is not useful for ghc
%global debug_package %{nil}
Name: ghc-%{pkg_name}
Version: 0.1.0.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -22,7 +23,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
%description
%{common_description}
@@ -31,9 +35,6 @@ This package provides the shared library.
%endif
-%{?ghc_lib_package}
-
-
%prep
%setup -q -n %{pkg_name}-%{version}
@@ -51,7 +52,13 @@ rm -rf $RPM_BUILD_ROOT
rm -rf $RPM_BUILD_ROOT
+%ghc_lib_package -o 0.1.0.6-4
+
+
%changelog
+* Sat Sep 4 2010 Jens Petersen <petersen at redhat.com> - 0.1.0.6-4
+- add hscolour and doc obsolete (cabal2spec-0.22.2)
+
* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 0.1.0.6-3
- sync cabal2spec-0.22.1
More information about the scm-commits
mailing list