[haskell-platform] update to 2011.4.0.0
Jens Petersen
petersen at fedoraproject.org
Wed Dec 28 08:58:27 UTC 2011
commit 1aee238f9a6e86371502b8b0d68ef9aa249f3d2c
Author: Jens Petersen <petersen at redhat.com>
Date: Wed Dec 28 17:58:21 2011 +0900
update to 2011.4.0.0
.gitignore | 1 +
haskell-platform.spec | 92 +++++++++++++++++++------------------------------
sources | 2 +-
3 files changed, 38 insertions(+), 57 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 9a00db0..fc66388 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ haskell-platform-2010.2.0.0.tar.gz
/haskell-platform-2011.1.0.0.tar.gz
/haskell-platform-2011.2.0.0.tar.gz
/haskell-platform-2011.2.0.1.tar.gz
+/haskell-platform-2011.4.0.0.tar.gz
diff --git a/haskell-platform.spec b/haskell-platform.spec
index bc8dc76..c0f1fea 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -16,35 +16,35 @@ distilled from Hackage.
# order here follows http://hackage.haskell.org/platform/changelog.html
%define platform_libs()\
-%{?2}Requires: ghc%{?1:-%1} = 7.0.4\
-%{?2}Requires: ghc-cgi%{?1:-%1} = 3001.1.7.4\
-%{?2}Requires: ghc-fgl%{?1:-%1} = 5.4.2.3\
-%{?2}Requires: ghc-GLUT%{?1:-%1} = 2.1.2.1\
-%{?2}Requires: ghc-haskell-src%{?1:-%1} = 1.0.1.4\
-%{?2}Requires: ghc-html%{?1:-%1} = 1.0.1.2\
-%{?2}Requires: ghc-HUnit%{?1:-%1} = 1.2.2.3\
-%{?2}Requires: ghc-mtl%{?1:-%1} = 2.0.1.0\
-%{?2}Requires: ghc-network%{?1:-%1} = 2.3.0.2\
-%{?2}Requires: ghc-OpenGL%{?1:-%1} = 2.2.3.0\
-%{?2}Requires: ghc-parallel%{?1:-%1} = 3.1.0.1\
-%{?2}Requires: ghc-parsec%{?1:-%1} = 3.1.1\
-%{?2}Requires: ghc-QuickCheck%{?1:-%1} = 2.4.0.1\
-%{?2}Requires: ghc-regex-base%{?1:-%1} = 0.93.2\
-%{?2}Requires: ghc-regex-compat%{?1:-%1} = 0.93.1\
-%{?2}Requires: ghc-regex-posix%{?1:-%1} = 0.94.4\
-%{?2}Requires: ghc-stm%{?1:-%1} = 2.2.0.1\
-%{?2}Requires: ghc-syb%{?1:-%1} = 0.3\
-%{?2}Requires: ghc-xhtml%{?1:-%1} = 3000.2.0.1\
-%{?2}Requires: ghc-zlib%{?1:-%1} = 0.5.3.1\
-%{?2}Requires: ghc-HTTP%{?1:-%1} = 4000.1.1\
-%{?2}Requires: ghc-deepseq%{?1:-%1} = 1.1.0.2\
-%{?2}Requires: ghc-text%{?1:-%1} = 0.11.0.6\
-%{?2}Requires: ghc-transformers%{?1:-%1} = 0.2.2.0\
+%{?1}Requires: ghc-libraries = 7.0.4\
+%{?1}Requires: ghc-cgi-devel = 3001.1.7.4\
+%{?1}Requires: ghc-fgl-devel = 5.4.2.4\
+%{?1}Requires: ghc-GLUT-devel = 2.1.2.1\
+%{?1}Requires: ghc-haskell-src-devel = 1.0.1.4\
+%{?1}Requires: ghc-html-devel = 1.0.1.2\
+%{?1}Requires: ghc-HUnit-devel = 1.2.4.2\
+%{?1}Requires: ghc-mtl-devel = 2.0.1.0\
+%{?1}Requires: ghc-network-devel = 2.3.0.5\
+%{?1}Requires: ghc-OpenGL-devel = 2.2.3.0\
+%{?1}Requires: ghc-parallel-devel = 3.1.0.1\
+%{?1}Requires: ghc-parsec-devel = 3.1.1\
+%{?1}Requires: ghc-QuickCheck-devel = 2.4.1.1\
+%{?1}Requires: ghc-regex-base-devel = 0.93.2\
+%{?1}Requires: ghc-regex-compat-devel = 0.95.1\
+%{?1}Requires: ghc-regex-posix-devel = 0.95.1\
+%{?1}Requires: ghc-stm-devel = 2.2.0.1\
+%{?1}Requires: ghc-syb-devel = 0.3.3\
+%{?1}Requires: ghc-xhtml-devel = 3000.2.0.4\
+%{?1}Requires: ghc-zlib-devel = 0.5.3.1\
+%{?1}Requires: ghc-HTTP-devel = 4000.1.2\
+%{?1}Requires: ghc-deepseq-devel = 1.1.0.2\
+%{?1}Requires: ghc-text-devel = 0.11.0.6\
+%{?1}Requires: ghc-transformers-devel = 0.2.2.0\
%{nil}
Name: %{pkg_name}
-Version: 2011.2.0.1
-Release: 2%{?dist}
+Version: 2011.4.0.0
+Release: 1%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
@@ -52,13 +52,11 @@ License: BSD
URL: http://hackage.haskell.org/platform
Source0: http://lambda.galois.com/hp-tmp/2011.2.0.1/%{name}-%{version}.tar.gz
ExclusiveArch: %{ghc_arches}
-# no QuickCheck on ppc64
-ExcludeArch: ppc64
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
BuildRequires: hscolour
%platform_progs Build
-%platform_libs devel Build
+%platform_libs Build
%platform_progs
Requires: ghc-haskell-platform-devel = %{version}
@@ -66,28 +64,18 @@ Requires: ghc-haskell-platform-devel = %{version}
%{common_description}
-%package -n ghc-%{name}
-Summary: %{common_summary} library
-Group: System Environment/Libraries
-%platform_libs
-
-%description -n ghc-%{name}
-%{common_description}
-
-This package is for the shared libraries.
-
-
%package -n ghc-%{name}-devel
Summary: %{common_summary} development files
Group: Development/Libraries
%{?ghc_devel_requires}
-%{?ghc_doc_requires}
-Requires: ghc-devel = %{ghc_version}
-%platform_libs devel
+Requires: ghc-libraries = %{ghc_version}
+%platform_libs
Obsoletes: ghc-%{name}-doc < 2010.2.0.0-0.1
Provides: ghc-%{name}-doc = %{version}-%{release}
Obsoletes: ghc-%{name}-prof < %{version}-%{release}
Provides: ghc-%{name}-prof = %{version}-%{release}
+# Added for F17
+Obsoletes: ghc-%{name} < %{version}-%{release}
%description -n ghc-%{name}-devel
%{common_description}
@@ -110,16 +98,8 @@ cd %{top_prefix}
cd %{top_prefix}
%ghc_lib_install
-# remove duplicate
-rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
-
-%post -n ghc-%{name}-devel
-%ghc_pkg_recache
-
-
-%postun -n ghc-%{name}-devel
-%ghc_pkg_recache
+%ghc_devel_post_postun
%files
@@ -127,15 +107,15 @@ rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENSE
%doc %{top_prefix}/LICENSE
-%files -n ghc-%{name} -f %{top_prefix}/ghc-%{name}.files
-%defattr(-,root,root,-)
-
-
%files -n ghc-%{name}-devel -f %{top_prefix}/ghc-%{name}-devel.files
%defattr(-,root,root,-)
%changelog
+* Wed Dec 28 2011 Jens Petersen <petersen at redhat.com> - 2011.4.0.0-1
+- update to 2011.4.0.0
+- reenable ppc64
+
* Tue Jun 21 2011 Jens Petersen <petersen at redhat.com> - 2011.2.0.1-2
- ghc_arches replaces ghc_excluded_archs (cabal2spec-0.23.2)
diff --git a/sources b/sources
index 29a72f4..442c86c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-97fd42f169a426d043368cec342745ef haskell-platform-2011.2.0.1.tar.gz
+0880f0943f55bc06962e7827e19ac71f haskell-platform-2011.4.0.0.tar.gz
More information about the scm-commits
mailing list