diff --git a/haskell-platform.spec b/haskell-platform.spec index ca8a96c..16a568e 100644 --- a/haskell-platform.spec +++ b/haskell-platform.spec @@ -2,7 +2,7 @@ %global ghc_compiler_version 7.6.3 %global alex_version 3.0.5 -%global cabal_install_version 1.16.0.2 +%global cabal_install_version 1.16.1.0 %global happy_version 1.18.10 %global HUnit_version 1.2.5.2 @@ -41,13 +41,13 @@ Version: 2013.2.0.0 # - release can only be reset if all library versions get bumped simultaneously # (eg for a major release) # - minor release numbers should be incremented monotonically -Release: 37%{?dist} +Release: 40%{?dist} Summary: Standard Haskell distribution Group: Development/Tools License: BSD -URL: http://hackage.haskell.org/platform -Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz +URL: http://www.haskell.org/platform/ +Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel BuildRequires: ghc-rpm-macros-extra @@ -98,7 +98,7 @@ BuildRequires: ghc-unordered-containers-devel = %{unordered_containers_version} # ghci "ghc" library is not officially part of hackage-platform Requires: ghc-compiler = %{ghc_compiler_version} Requires: alex = %{alex_version} -Requires: cabal-install = %{cabal_install_version} +Requires: cabal-install >= %{cabal_install_version} Requires: happy = %{happy_version} Requires: ghc-haskell-platform-devel = %{version}-%{release} @@ -171,9 +171,9 @@ This provides the haskell-platform meta library package. %prep %setup -q -n %{name}-%{version} -cd packages - -cd .. +cd packages/%{name}-%{version} +cabal-tweak-dep-ver cabal-install '==1.16.0.2' '==%{cabal_install_version}' +cd ../.. %build @@ -252,6 +252,16 @@ rm %{buildroot}/%{_docdir}/ghc-%{name}*/LICENSE %changelog +* Thu Nov 24 2016 Jens Petersen - 2013.2.0.0-40 +- rebuild + +* Mon May 18 2015 Jens Petersen - 2013.2.0.0-39 +- bump cabal-install to 1.16.1.0 and allow newer versions +- update urls + +* Sat Aug 16 2014 Fedora Release Engineering - 2013.2.0.0-38 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Tue Jul 8 2014 Jens Petersen - 2013.2.0.0-37 - rebuild for F21