rpms/haskell-platform
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

reversion to 2014.2.0.0.1

Browse Source
This commit is contained in:
Jens Petersen 2015-02-06 07:32:50 +01:00
parent 500be8f46a
commit 548dcd55d9
2 changed files with 49 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
haskell-platform-2014.2.0.0-attoparsec-text.patch Normal file
View File

@ -0,0 +1,36 @@
--- haskell-platform-2014.2.0.0/haskell-platform.cabal~ 2014-09-02 09:32:43.157333050 +0200
+++ haskell-platform-2014.2.0.0/haskell-platform.cabal 2015-02-06 07:16:31.427973656 +0100
@@ -1,5 +1,5 @@
name: haskell-platform
-version: 2014.2.0.0
+version: 2014.2.0.0.1
homepage: http://haskell.org/platform
license: BSD3
license-file: LICENSE
@@ -32,7 +32,7 @@
library
if flag(include-ghc-depends)
build-depends:
- ghc ==7.8.3,
+ ghc ==7.8.4,
-- Core libraries: provided by every ghc installation
-- We don't include "non-API" packages here.
@@ -65,7 +65,7 @@
-- Libraries in addition to what GHC provides:
-- Note: newer versions of cgi need monad-catchio.
async ==2.0.1.5,
- attoparsec ==0.10.4.0,
+ attoparsec ==0.11.3.4
case-insensitive ==1.1.0.3,
fgl ==5.5.0.1,
GLUT ==2.5.1.1,
@@ -90,7 +90,7 @@
split ==0.2.2,
stm ==2.4.2,
syb ==0.4.1,
- text ==1.1.0.0,
+ text ==1.1.1.3,
unordered-containers ==0.2.4.0,
vector ==0.10.9.1,
xhtml ==3000.2.1,

21
haskell-platform.spec
View File

@ -37,20 +37,23 @@
%global separate_packages QuickCheck|HTTP|HUnit|alex|cabal-install|happy|html|mtl|network|parallel|parsec|random|regex-base|regex-compat|regex-posix|stm|syb|text|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers|xhtml|hscolour
%global upstream_version 2014.2.0.0
Name: haskell-platform
Version: 2014.2.0.0
Version: %{upstream_version}.1
# 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: 2%{?dist}
Release: 1%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
License: BSD
URL: http://www.haskell.org/platform/
Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{version}-srcdist.tar.gz
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
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@ -128,8 +131,6 @@ and tools. It provides a good starting environment for Haskell development.
%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 1.5.0.0
%endif
%global version %{haskell_platform_version}
%package -n ghc-haskell-platform-devel
Summary: Haskell Platform library development files
Requires(post): ghc-compiler = %{ghc_version}
@ -174,9 +175,13 @@ Obsoletes: ghc-haskell-platform < %{version}-%{release}
This provides the haskell-platform meta library package.
%global version %{haskell_platform_version}
%prep
%setup -q -n %{name}-%{version}
%setup -q -n %{name}-%{upstream_version}
%patch1 -p1 -b .orig
%patch2 -p1 -b .orig
# hack for h-p.cabal in top dir
mkdir packages/%{name}-%{version}
@ -246,8 +251,8 @@ rm %{buildroot}/%{_docdir}/ghc-%{name}*/LICENSE
%changelog
* Sat Jan 24 2015 Jens Petersen <petersen@fedoraproject.org> - 2014.2.0.0-2
- using ghc-7.8.4
* 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
- bump text to 1.1.1.3