bump QuickCheck, alex, happy, and cabal-install to newer versions

This commit is contained in:
Jens Petersen 2015-04-03 13:15:48 +09:00
parent 508bdfe008
commit 7d520c824b
2 changed files with 35 additions and 7 deletions

View File

@ -0,0 +1,20 @@
--- haskell-platform-2014.2.0.0.2/haskell-platform.cabal~ 2015-03-25 18:27:44.653000000 +0900
+++ haskell-platform-2014.2.0.0.2/haskell-platform.cabal 2015-03-25 18:32:40.172000000 +0900
@@ -82,7 +82,7 @@
parallel ==3.2.0.4,
parsec ==3.1.5,
primitive ==0.5.2.1,
- QuickCheck ==2.6,
+ QuickCheck ==2.7.6,
random ==1.0.1.1,
regex-base ==0.93.2,
regex-compat ==0.95.1,
@@ -104,6 +104,6 @@
-- We list them to help distro packaging.
build-tools:
-- cabal-install ==1.18.0.5,
- alex ==3.1.3,
- happy ==1.19.4,
+ alex ==3.1.4,
+ happy ==1.19.5,
hscolour ==1.20

View File

@ -1,9 +1,9 @@
# https://fedoraproject.org/wiki/Packaging:Haskell
%global ghc_compiler_version 7.8.4
%global alex_version 3.1.3
%global cabal_install_version 1.18.0.5
%global happy_version 1.19.4
%global alex_version 3.1.4
%global cabal_install_version 1.18.0.8
%global happy_version 1.19.5
%global HTTP_version 4000.2.10
%global HUnit_version 1.2.5.2
@ -12,7 +12,7 @@
%global network_version 2.4.2.3
%global parallel_version 3.2.0.4
%global parsec_version 3.1.5
%global QuickCheck_version 2.6
%global QuickCheck_version 2.7.6
%global random_version 1.0.1.1
%global regex_base_version 0.93.2
%global regex_compat_version 0.95.1
@ -40,12 +40,12 @@
%global upstream_version 2014.2.0.0
Name: haskell-platform
Version: %{upstream_version}.1
Version: %{upstream_version}.2
# Since library subpackages are versioned:
# - 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: 1%{?dist}
Release: 2%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
@ -54,6 +54,7 @@ URL: http://www.haskell.org/platform/
Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{upstream_version}-srcdist.tar.gz
Patch1: haskell-platform-2014-buildtools.patch
Patch2: haskell-platform-2014.2.0.0-attoparsec-text.patch
Patch3: haskell-platform-2014.2.0.0-QuickCheck-alex-happy.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@ -181,7 +182,8 @@ This provides the haskell-platform meta library package.
%prep
%setup -q -n %{name}-%{upstream_version}
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig
%patch2 -p1
%patch3 -p1
# hack for h-p.cabal in top dir
mkdir packages/%{name}-%{version}
@ -251,6 +253,12 @@ rm %{buildroot}/%{_docdir}/ghc-%{name}*/LICENSE
%changelog
* Fri Apr 3 2015 Jens Petersen <petersen@redhat.com> - 2014.2.0.0.2-2
- bump alex to 3.1.4
- bump cabal-install to 1.18.0.8
- bump happy to 1.19.5
- bump QuickCheck to 2.7.6
* Fri Feb 6 2015 Jens Petersen <petersen@redhat.com> - 2014.2.0.0.1-1
- use ghc-7.8.4
- bump attoparsec to 0.11.3.4