From 738a5f4f48171753b3ce7bd16e0a0865dff185d2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Jun 22 2011 08:33:27 +0000 Subject: update to cabal2spec-0.23.2 --- diff --git a/ghc-MissingH.spec b/ghc-MissingH.spec index 7748d28..9f1486c 100644 --- a/ghc-MissingH.spec +++ b/ghc-MissingH.spec @@ -6,14 +6,9 @@ Haskell programmers. It is written in pure Haskell and thus \ should be extremely portable and easy to use. -%global ghc_pkg_deps ghc-HUnit-devel, ghc-hslogger-devel, ghc-mtl-devel, ghc-network-devel, ghc-parsec-devel, ghc-regex-compat-devel - -# debuginfo is not useful for ghc -%global debug_package %{nil} - Name: ghc-%{pkg_name} Version: 1.1.0.3 -Release: 7%{?dist} +Release: 8%{?dist} Summary: %{common_summary} Group: System Environment/Libraries @@ -25,18 +20,14 @@ Group: System Environment/Libraries License: GPLv2+ URL: http://hackage.haskell.org/package/%{pkg_name} Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz -# fedora ghc archs: -ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 -BuildRequires: ghc, ghc-doc, ghc-prof -BuildRequires: ghc-rpm-macros >= 0.7.3 +ExclusiveArch: %{ghc_arches} +BuildRequires: ghc-Cabal-devel +BuildRequires: ghc-rpm-macros BuildRequires: hscolour -%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")} +BuildRequires: ghc-HUnit-prof, ghc-hslogger-prof, ghc-mtl-prof, ghc-network-prof, ghc-parsec-prof, ghc-regex-compat-prof %description %{common_description} -%if %{with shared} -This package provides the shared library. -%endif %prep @@ -65,10 +56,13 @@ install -m 644 -p announcements/0.9.0.txt %{buildroot}%{_docdir}/%{name}-%{versi install -m 644 -p announcements/0.10.0.txt %{buildroot}%{_docdir}/%{name}-%{version}/announcements/0.10.0.txt -%{?ghc_lib_package} +%ghc_lib_package %changelog +* Wed Jun 22 2011 Jens Petersen - 1.1.0.3-8 +- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2) + * Thu Mar 10 2011 Fabio M. Di Nitto - 1.1.0.3-7 - Enable build on sparcv9