cabal-install and hscolour version confuse Cabal

This commit is contained in:
Jens Petersen 2015-10-02 18:42:04 +09:00
parent b1e77fe36e
commit 16212bf2db
2 changed files with 15 additions and 0 deletions

View File

@ -0,0 +1,13 @@
--- haskell-platform-7.10.2-a/packages/haskell-platform-7.10.2/haskell-platform.cabal~ 2015-08-06 00:06:13.000000000 +0900
+++ haskell-platform-7.10.2-a/packages/haskell-platform-7.10.2/haskell-platform.cabal 2015-10-02 18:40:24.046614029 +0900
@@ -110,8 +110,8 @@
-- Depending on programs does not work, they are not registered
-- We list them to help distro packaging.
build-tools:
- cabal-install ==1.22.6.0,
+-- cabal-install ==1.22.6.0,
alex ==3.1.4,
happy ==1.19.5,
- hscolour ==1.23,
+ hscolour ==1.20,
haddock ==2.16.1

View File

@ -56,6 +56,7 @@ Group: Development/Tools
License: BSD
URL: http://www.haskell.org/platform/
Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{upstream_version}-a.tar.gz
Patch1: haskell-platform-build-tools.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@ -201,6 +202,7 @@ cp LICENSE hptool/Setup.hs packages/%{name}-%{version}
# HsColour reports 1.20
#cabal-tweak-dep-ver hscolour '==1.20.3' '==1.20'
mv %{name}.cabal packages/%{name}-%{version}
%patch1 -p1 -b .orig
%build