[cabal-install] bring back requires for ghc-compiler

Jens Petersen petersen at fedoraproject.org
Fri Dec 16 06:13:31 UTC 2011


commit dda4336a5848535f8951536c9ee66bc4c70987f7
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Dec 16 15:13:17 2011 +0900

    bring back requires for ghc-compiler
    
    Reported by Stanislav Ochotnicky in #760461

 cabal-install.spec |   20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/cabal-install.spec b/cabal-install.spec
index d34a863..4cd49ec 100644
--- a/cabal-install.spec
+++ b/cabal-install.spec
@@ -1,20 +1,24 @@
 Name:           cabal-install
 # part of haskell-platform-2011.2.0.1
 Version:        0.10.2
-Release:        4%{?dist}.2
+Release:        5%{?dist}
 Summary:        Haskell package tool
 
 Group:          Development/Tools
 License:        BSD
+# BEGIN cabal2spec
 URL:            http://hackage.haskell.org/package/%{name}
 Source0:        http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
-Source1:        cabal-install.sh
 ExclusiveArch:  %{ghc_arches}
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-rpm-macros
-BuildRequires:  ghc-zlib-devel, ghc-HTTP-devel, ghc-random-devel, ghc-time-devel
-# allow use with local ghc install
-#Requires:       ghc
+# END cabal2spec
+Source1:        cabal-install.sh
+BuildRequires:  ghc-zlib-devel
+BuildRequires:  ghc-HTTP-devel
+BuildRequires:  ghc-random-devel
+BuildRequires:  ghc-time-devel
+Requires:       ghc-compiler
 
 %description
 The 'cabal' command-line program simplifies the process of managing Haskell
@@ -39,11 +43,8 @@ cp -p bash-completion/cabal $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
 
-rm ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/LICENSE
-
 
 %files
-%defattr(-,root,root,-)
 %doc LICENSE README
 %{_bindir}/cabal
 %{_sysconfdir}/bash_completion.d
@@ -51,6 +52,9 @@ rm ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-%{version}/LICENSE
 
 
 %changelog
+* Fri Dec 16 2011 Jens Petersen <petersen at redhat.com> - 0.10.2-5
+- bring back requires ghc-compiler (Stanislav Ochotnicky, #760461)
+
 * Thu Oct 20 2011 Marcela Mašláňová <mmaslano at redhat.com> - 0.10.2-4.2
 - rebuild with new gmp without compat lib
 


More information about the scm-commits mailing list