[haddock] Upgrade to cabal2spec 0.23.2 modified: haddock.spec

Lakshmi Narasimhan T V narasim at fedoraproject.org
Tue Jun 21 12:17:17 UTC 2011


commit 5e9d71e70039a500b3ec0cf9144c2edd74ad5e77
Author: Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com>
Date:   Tue Jun 21 17:46:47 2011 +0530

    Upgrade to cabal2spec 0.23.2
    	modified:   haddock.spec

 haddock.spec |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/haddock.spec b/haddock.spec
index 700d466..b701a54 100644
--- a/haddock.spec
+++ b/haddock.spec
@@ -4,23 +4,22 @@
 
 %global common_description  A documentation-generation tool for Haskell libraries.
 
-%global ghc_pkg_deps ghc-ghc-paths-devel, ghc-ghc-devel, ghc-xhtml-devel
 
 Name:           %{pkg_name}
 Version:        2.9.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        %{common_summary}
 
 Group:          Development/Tools
 License:        BSD
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{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
+# macros for building haskell packages
+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-ghc-paths-prof, ghc-ghc-prof, ghc-xhtml-prof
 BuildRequires:  alex, happy 
 
 %description
@@ -53,6 +52,9 @@ mv $RPM_BUILD_ROOT%{_bindir}/%{name}{,-%{version}}
 
 
 %changelog
+* Tue Jun 21 2011 Lakshmi Narasimhan T V <lakshminaras2002 at gmail.com> - 2.9.2-3
+- Update to  cabal2spec-0.23.2
+
 * Fri Apr  1 2011 Jens Petersen <petersen at redhat.com> - 2.9.2-2
 - minor changes to sync with cabal2spec-0.22.5
 


More information about the scm-commits mailing list