[ghc-X11] update to cabal2spec-0.23.2

Jens Petersen petersen at fedoraproject.org
Wed Jun 22 05:32:14 UTC 2011


commit fb91bb2fef1ffb0e73a353dc44d12b7516380cb8
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Jun 22 14:32:02 2011 +0900

    update to cabal2spec-0.23.2

 ghc-X11.spec |   22 ++++++++--------------
 1 files changed, 8 insertions(+), 14 deletions(-)
---
diff --git a/ghc-X11.spec b/ghc-X11.spec
index 0ba7d53..c35d215 100644
--- a/ghc-X11.spec
+++ b/ghc-X11.spec
@@ -6,35 +6,26 @@
 documentation of these calls, refer to "The Xlib Programming\
 Manual", available online at <http://tronche.com/gui/x/xlib/>.
 
-%global ghc_pkg_deps ghc-syb-devel
-
 %global ghc_pkg_c_deps libXinerama-devel, libX11-devel, libXext-devel
 
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-
 Name:           ghc-%{pkg_name}
 Version:        1.5.0.0
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        BSD
 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")}
 %{?ghc_pkg_c_deps:BuildRequires:  %{ghc_pkg_c_deps}}
+BuildRequires:  ghc-syb-prof
 
 %description
 %{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
 
 
 %prep
@@ -53,6 +44,9 @@ This package provides the shared library.
 
 
 %changelog
+* Wed Jun 22 2011 Jens Petersen <petersen at redhat.com> - 1.5.0.0-12
+- BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)
+
 * Thu Mar 10 2011 Fabio M. Di Nitto <fdinitto at redhat.com> - 1.5.0.0-11
 - Enable build on sparcv9
 


More information about the scm-commits mailing list