[haskell-platform/el6/master] update to haskell-platform-2010.2.0.0 from f14
Jens Petersen
petersen at fedoraproject.org
Thu Oct 7 03:45:12 UTC 2010
commit 1f1fc6e252c20b1aaa987361c3f55736702bc912
Author: Jens Petersen <petersen at redhat.com>
Date: Thu Oct 7 13:45:18 2010 +1000
update to haskell-platform-2010.2.0.0 from f14
.gitignore | 2 +-
...l-platform-2009.2.0.2-relax-cabal-install.patch | 14 --
haskell-platform.spec | 215 ++++++++++----------
sources | 2 +-
4 files changed, 112 insertions(+), 121 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4895354..2d54518 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-haskell-platform-2009.2.0.2.tar.gz
+haskell-platform-2010.2.0.0.tar.gz
diff --git a/haskell-platform.spec b/haskell-platform.spec
index 62ae2e1..ad70a5d 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -1,137 +1,120 @@
-%bcond_without doc
-%bcond_without prof
+%global pkg_name haskell-platform
-# ghc does not emit debug information
+%global common_summary Standard Haskell distribution
+
+%global common_description The Haskell Platform is a blessed library and tool suite for Haskell\
+distilled from Hackage.
+
+%bcond_without shared
+
+%global upstream_version 2010.2.0.0
+
+# debuginfo is not useful for ghc
%global debug_package %{nil}
+
%define platform_progs()\
-%{?1}Requires: ghc = 6.10.4\
-%{?1}Requires: cabal-install >= 0.6.2\
-%{?1}Requires: alex = 2.3.1\
-%{?1}Requires: happy = 1.18.4\
+%{?1}Requires: ghc = 6.12.3\
+%{?1}Requires: cabal-install = 0.8.2\
+%{?1}Requires: alex = 2.3.3\
+%{?1}Requires: happy = 1.18.5\
%{nil}
%define platform_libs()\
-%{?2}Requires: ghc-cgi-%1 = 3001.1.7.1\
-%{?2}Requires: ghc-fgl-%1 = 5.4.2.2\
-%{?2}Requires: ghc-editline-%1 = 0.2.1.0\
-%{?2}Requires: ghc-GLUT-%1 = 2.1.1.2\
-%{?2}Requires: ghc-network-%1 = 2.2.1.4\
-%{?2}Requires: ghc-OpenGL-%1 = 2.2.1.1\
-%{?2}Requires: ghc-time-%1 = 1.1.2.4\
-%{?2}Requires: ghc-zlib-%1 = 0.5.0.0\
-%{?2}Requires: ghc-HTTP-%1 = 4000.0.6\
-# following are part of ghc-6.10 extralibs\
-# %{?2}Requires: ghc-HUnit-%1 = 1.2.0.3\
-# (all rest need to be packaged for 6.12):\
-# %{?2}Requires: ghc-QuickCheck-%1 = 1.2.0.0\
-# %{?2}Requires: ghc-haskell-src-%1 = 1.0.1.3\
-# %{?2}Requires: ghc-html-%1 = 1.0.1.2\
-# %{?2}Requires: ghc-mtl-%1 = 1.1.0.2\
-# %{?2}Requires: ghc-parsec-%1 = 2.1.0.1\
-# %{?2}Requires: ghc-parallel-%1 = 1.1.0.1\
-# %{?2}Requires: ghc-regex-base-%1 = 0.72.0.2\
-# %{?2}Requires: ghc-regex-compat-%1 = 0.71.0.1\
-# %{?2}Requires: ghc-regex-posix-%1 = 0.72.0.3\
-# %{?2}Requires: ghc-stm-%1 = 2.1.1.2\
-# %{?2}Requires: ghc-xhtml-%1 = 3000.2.0.1\
+%{?2}Requires: ghc-cgi%{?1:-%1} = 3001.1.7.3\
+%{?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.3\
+%{?2}Requires: ghc-html%{?1:-%1} = 1.0.1.2\
+%{?2}Requires: ghc-HUnit%{?1:-%1} = 1.2.2.1\
+%{?2}Requires: ghc-mtl%{?1:-%1} = 1.1.0.2\
+%{?2}Requires: ghc-network%{?1:-%1} = 2.2.1.7\
+%{?2}Requires: ghc-OpenGL%{?1:-%1} = 2.2.3.0\
+%{?2}Requires: ghc-parsec%{?1:-%1} = 2.1.0.1\
+%{?2}Requires: ghc-parallel%{?1:-%1} = 2.2.0.1\
+%{?2}Requires: ghc-QuickCheck%{?1:-%1} = 2.1.1.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.2\
+%{?2}Requires: ghc-stm%{?1:-%1} = 2.1.2.1\
+%{?2}Requires: ghc-xhtml%{?1:-%1} = 3000.2.0.1\
+%{?2}Requires: ghc-zlib%{?1:-%1} = 0.5.2.0\
+%{?2}Requires: ghc-HTTP%{?1:-%1} = 4000.0.9\
+%{?2}Requires: ghc-deepseq%{?1:-%1} = 1.1.0.0\
%{nil}
-
-Name: haskell-platform
-Version: 2009.2.0.2
-Release: 4%{?dist}
+Name: %{pkg_name}
+Version: %{upstream_version}
+Release: 1%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
License: BSD
URL: http://hackage.haskell.org/platform
-Source0: http://hackage.haskell.org/platform/%{version}/cabal/%{name}-%{version}.tar.gz
-Patch1: haskell-platform-2009.2.0.2-relax-cabal-install.patch
+Source0: http://hackage.haskell.org/platform/%{upstream_version}/cabal/%{name}-%{upstream_version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha
-BuildRequires: ghc, ghc-rpm-macros
-%if %{with doc}
-BuildRequires: ghc-doc
-%endif
-%if %{with prof}
-BuildRequires: ghc-prof
-%endif
+BuildRequires: ghc, ghc-prof
+BuildRequires: ghc-rpm-macros >= 0.8.1
%platform_progs Build
%platform_libs devel Build
%platform_progs
Requires: ghc-haskell-platform-devel = %{version}
%description
-The Haskell Platform is a blessed library and tool suite for Haskell
-distilled from Hackage.
+%{common_description}
+
+
+%package -n ghc-%{name}
+Summary: %{common_summary} library
+Group: System Environment/Libraries
+%platform_libs
+
+%description -n ghc-%{name}
+%{common_description}
+
+This package contains the shared library.
%package -n ghc-%{name}-devel
-Summary: Standard Haskell distribution libraries
+Summary: %{common_summary} development files
Group: Development/Libraries
-Provides: ghc-%{name} = %{version}-%{release}
-Requires: ghc = %{ghc_version}
-Requires(post): ghc = %{ghc_version}
-Requires(preun): ghc = %{ghc_version}
+%{?ghc_requires}
+%{?ghc_doc_requires}
%platform_libs devel
+Obsoletes: ghc-%{name}-doc < 2010.2.0.0-0.1
%description -n ghc-%{name}-devel
-This package contains the development files for %{name}
-built for ghc-%{ghc_version}.
+%{common_description}
-
-%if %{with doc}
-%package -n ghc-%{name}-doc
-Summary: Standard Haskell distribution documentation
-Group: Development/Libraries
-Requires: ghc-doc = %{ghc_version}
-Requires(post): ghc-doc = %{ghc_version}
-Requires(postun): ghc-doc = %{ghc_version}
-%platform_libs doc
-
-%description -n ghc-%{name}-doc
-This package contains development documentation files for the
-%{name} library.
-%endif
+This package contains the development files.
-%if %{with prof}
%package -n ghc-%{name}-prof
-Summary: Standard Haskell distribution profiling libraries
+Summary: %{common_summary} profiling libraries
Group: Development/Libraries
Requires: ghc-%{name}-devel = %{version}-%{release}
Requires: ghc-prof = %{ghc_version}
%platform_libs prof
%description -n ghc-%{name}-prof
-This package contains profiling libraries for %{name}
-built for ghc-%{ghc_version}.
-%endif
+%{common_description}
+
+This package contains profiling libraries.
%prep
-%setup -q
-# allow cabal-install > 0.6.2
-%patch1 -p1 -b .orig
+%setup -q -n %{name}-%{upstream_version}
+
%build
-%cabal_configure --ghc %{?with_prof:-p}
-%cabal build
-%if %{with doc}
-%cabal haddock
-%endif
-%ghc_gen_scripts
+%ghc_lib_build
%install
rm -rf $RPM_BUILD_ROOT
-%cabal_install
-# metapackage so need to create:
-mkdir -p $RPM_BUILD_ROOT%{ghcpkgdir}
-%ghc_install_scripts
-%ghc_gen_filelists ghc-%{name}
+%ghc_lib_install
%clean
@@ -139,27 +122,18 @@ rm -rf $RPM_BUILD_ROOT
%post -n ghc-%{name}-devel
-%ghc_register_pkg
-
-
-%if %{with doc}
-%post -n ghc-%{name}-doc
+ghc-pkg recache
%ghc_reindex_haddock
-%endif
%preun -n ghc-%{name}-devel
-if [ "$1" -eq 0 ] ; then
- %ghc_unregister_pkg
-fi
+ghc-pkg recache
-%if %{with doc}
-%postun -n ghc-%{name}-doc
+%postun -n ghc-%{name}-devel
if [ "$1" -eq 0 ] ; then
%ghc_reindex_haddock
fi
-%endif
%files
@@ -167,25 +141,56 @@ fi
%doc LICENSE
-%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
+%files -n ghc-%{name} -f ghc-%{name}.files
%defattr(-,root,root,-)
+%doc LICENSE
-%if %{with doc}
-%files -n ghc-%{name}-doc -f ghc-%{name}-doc.files
+%files -n ghc-%{name}-devel -f ghc-%{name}-devel.files
%defattr(-,root,root,-)
-%endif
-%if %{with prof}
%files -n ghc-%{name}-prof -f ghc-%{name}-prof.files
%defattr(-,root,root,-)
-%endif
%changelog
-* Tue Jan 19 2010 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-4
-- allow cabal-install >= 0.6.2 (#555966)
+* Fri Jul 23 2010 Jens Petersen <petersen at redhat.com> - 2010.2.0.0-1
+- update to 2010.2.0.0 final release (no actual changes)
+
+* Sun Jul 18 2010 Jens Petersen <petersen at redhat.com> - 2010.2.0.0-0.1
+- drop debuginfo again: ghc_strip_dynlinked got fixed in ghc-rpm-macros-0.8.1
+
+* Fri Jul 16 2010 Jens Petersen <petersen at redhat.com> - 2010.2.0.0-0.1
+- update to 2010.2.0.0 RC
+- obsolete ghc-haskell-platform-doc in line with ghc-rpm-macros-0.8.0
+- add License to base library too
+
+* Sun Jun 27 2010 Jens Petersen <petersen at redhat.com> - 2010.1.0.0.6123-1
+- bump ghc to 6.12.3
+- sync cabal2spec-0.22.1
+- enable debugging for now to avoid empty strip error
+
+* Thu Apr 29 2010 Jens Petersen <petersen at redhat.com> - 2010.1.0.0.6122-1
+- break haskell-platform-2010.1.0.0 with ghc-6.12.2
+
+* Wed Mar 24 2010 Jens Petersen <petersen at redhat.com> - 2010.1.0.0-1
+- update to 2010.1.0.0 beta release
+- update versions of alex, cgi, network, parallel, QuickCheck, HTTP
+- new deepseq dep (#576482)
+
+* Thu Jan 28 2010 Jens Petersen <petersen at redhat.com> - 2009.3.1.20100115-0.2
+- add filelist for shared libs
+- update devel post and postun
+
+* Sat Jan 16 2010 Jens Petersen <petersen at redhat.com> - 2009.3.1.20100115-0.1
+- update to darcs snapshot patched for ghc-6.12.1
+- update to ghc-rpm-macros-0.5.1 and cabal2spec-0.21.1:
+- drop doc and prof bcond
+- use common_summary and common_description
+- use ghc_lib_package and ghc_pkg_deps
+- build shared library
+- drop redundant buildroot and its install cleaning
* Mon Sep 28 2009 Jens Petersen <petersen at redhat.com> - 2009.2.0.2-3
- fix rpmlint warnings (bos, #523883)
diff --git a/sources b/sources
index 02eacdf..54681eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e81ffeb6ab1905975a6bdd8e96adb5f4 haskell-platform-2009.2.0.2.tar.gz
+9c9c6422ebfe1a5e78e69ae017f4d54b haskell-platform-2010.2.0.0.tar.gz
More information about the scm-commits
mailing list