[ghc-gtk] BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)

Jens Petersen petersen at fedoraproject.org
Tue Jun 21 09:30:26 UTC 2011


commit 2ce618aca45185a136402ae46fa5adec1f312e1c
Author: Jens Petersen <petersen at redhat.com>
Date:   Tue Jun 21 18:30:15 2011 +0900

    BR ghc-Cabal-devel instead of ghc-prof and use ghc_arches (cabal2spec-0.23.2)

 ghc-gtk.spec |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 deletions(-)
---
diff --git a/ghc-gtk.spec b/ghc-gtk.spec
index a4839dd..6f94cd5 100644
--- a/ghc-gtk.spec
+++ b/ghc-gtk.spec
@@ -4,42 +4,30 @@
 
 %global common_description A %{pkg_name} library for Haskell.
 
-%global ghc_pkg_deps ghc-glib-devel, ghc-pango-devel, ghc-cairo-devel, ghc-gio-devel, ghc-mtl-devel
-
 %global ghc_pkg_c_deps gtk2-devel
 
 # obsolete old gtk2hs packages
 %global ghc_pkg_obsoletes ghc-gtkglext-devel < 0.11, ghc-soegtk-devel < 0.11, ghc-vte-devel < 0.11
 
-# debuginfo is not useful for ghc
-%global debug_package %{nil}
-
 Name:           ghc-%{pkg_name}
 Version:        0.12.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        %{common_summary}
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 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:  gtk2hs-buildtools
+BuildRequires:  ghc-glib-prof, ghc-pango-prof, ghc-cairo-prof, ghc-gio-prof, ghc-mtl-prof
 
 %description
 %{common_description}
-%if %{with shared}
-This package provides the shared library.
-%endif
-
-
-%{?ghc_lib_package}
 
 
 %prep
@@ -58,7 +46,13 @@ rm -r $RPM_BUILD_ROOT%{_datadir}/%{pkg_name}-%{version}
 echo %doc demo >> %{name}-devel.files
 
 
+%ghc_lib_package
+
+
 %changelog
+* Tue Jun 21 2011 Jens Petersen <petersen at redhat.com> - 0.12.0-5
+- 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> - 0.12.0-4
 - Enable build on sparcv9
 


More information about the scm-commits mailing list