petersen pushed to haskell-platform (f22). "merge the haskell-platform.cabal patches into one"
notifications at fedoraproject.org
notifications at fedoraproject.org
Fri Apr 17 07:12:50 UTC 2015
>From fe3633773d03cd72418fcf0916f0742aff516163 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen at redhat.com>
Date: Fri, 3 Apr 2015 19:17:15 +0900
Subject: merge the haskell-platform.cabal patches into one
diff --git a/haskell-platform-2014-buildtools.patch b/haskell-platform-2014-buildtools.patch
deleted file mode 100644
index f7887a6..0000000
--- a/haskell-platform-2014-buildtools.patch
+++ /dev/null
@@ -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
diff --git a/haskell-platform-2014.2.0.0-QuickCheck-alex-happy.patch b/haskell-platform-2014.2.0.0-QuickCheck-alex-happy.patch
deleted file mode 100644
index fe6a510..0000000
--- a/haskell-platform-2014.2.0.0-QuickCheck-alex-happy.patch
+++ /dev/null
@@ -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
diff --git a/haskell-platform-2014.2.0.0-attoparsec-text.patch b/haskell-platform-2014.2.0.0-attoparsec-text.patch
deleted file mode 100644
index c38a6e7..0000000
--- a/haskell-platform-2014.2.0.0-attoparsec-text.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- 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,
diff --git a/haskell-platform-2014.2.0.0-version-bumps.patch b/haskell-platform-2014.2.0.0-version-bumps.patch
new file mode 100644
index 0000000..469b078
--- /dev/null
+++ b/haskell-platform-2014.2.0.0-version-bumps.patch
@@ -0,0 +1,59 @@
+--- 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.2
+ 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,
+@@ -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,
+ 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,
+@@ -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
diff --git a/haskell-platform.spec b/haskell-platform.spec
index c27cd3f..eed3067 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -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}
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/haskell-platform.git/commit/?h=f22&id=fe3633773d03cd72418fcf0916f0742aff516163
More information about the scm-commits
mailing list