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

merge the haskell-platform.cabal patches into one

Browse Source
This commit is contained in:
Jens Petersen 2015-04-03 19:17:15 +09:00
parent 7d520c824b
commit fe3633773d
4 changed files with 27 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
haskell-platform-2014-buildtools.patch
View File

@ -1,12 +0,0 @@
--- haskell-platform-2014.2.0.0/haskell-platform.cabal~ 2014-07-31 21:03:34.000000000 +0200
+++ haskell-platform-2014.2.0.0/haskell-platform.cabal 2014-08-08 17:26:08.251652558 +0200
@@ -103,7 +103,7 @@
-- Depending on programs does not work, they are not registered
-- We list them to help distro packaging.
build-tools:
- cabal-install ==1.18.0.5,
+-- cabal-install ==1.18.0.5,
alex ==3.1.3,
happy ==1.19.4,
- hscolour ==1.20.3
+ hscolour ==1.20

20
haskell-platform-2014.2.0.0-QuickCheck-alex-happy.patch
View File

@ -1,20 +0,0 @@
--- 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

29
haskell-platform-2014.2.0.0-attoparsec-text.patch → haskell-platform-2014.2.0.0-version-bumps.patch
View File

@ -1,9 +1,9 @@
--- 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
--- haskell-platform-2014.2.0.0/haskell-platform.cabal.orig 2014-08-01 04:03:34.000000000 +0900
+++ haskell-platform-2014.2.0.0/haskell-platform.cabal 2015-04-03 19:11:23.516593508 +0900
@@ -1,5 +1,5 @@
name: haskell-platform
-version: 2014.2.0.0
+version: 2014.2.0.0.1
+version: 2014.2.0.0.2
homepage: http://haskell.org/platform
license: BSD3
license-file: LICENSE
@ -25,6 +25,15 @@
case-insensitive ==1.1.0.3,
fgl ==5.5.0.1,
GLUT ==2.5.1.1,
@@ -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,
@@ -90,7 +90,7 @@
split ==0.2.2,
stm ==2.4.2,
@ -34,3 +43,17 @@
unordered-containers ==0.2.4.0,
vector ==0.10.9.1,
xhtml ==3000.2.1,
@@ -103,7 +103,7 @@
-- Depending on programs does not work, they are not registered
-- We list them to help distro packaging.
build-tools:
- cabal-install ==1.18.0.5,
- alex ==3.1.3,
- happy ==1.19.4,
- hscolour ==1.20.3
+-- cabal-install ==1.18.0.8,
+ alex ==3.1.4,
+ happy ==1.19.5,
+ hscolour ==1.20
Diff finished. Fri Apr 3 19:11:31 2015

6
haskell-platform.spec
View File

@ -52,9 +52,7 @@ Group: Development/Tools
License: BSD
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
Patch1: haskell-platform-2014.2.0.0-version-bumps.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@ -182,8 +180,6 @@ This provides the haskell-platform meta library package.
%prep
%setup -q -n %{name}-%{upstream_version}
%patch1 -p1 -b .orig
%patch2 -p1
%patch3 -p1
# hack for h-p.cabal in top dir
mkdir packages/%{name}-%{version}