commit haskell-platform for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package haskell-platform for openSUSE:Factory checked in at 2014-11-26 20:55:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/haskell-platform (Old) and /work/SRC/openSUSE:Factory/.haskell-platform.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "haskell-platform" Changes: -------- --- /work/SRC/openSUSE:Factory/haskell-platform/haskell-platform.changes 2014-08-25 11:06:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.haskell-platform.new/haskell-platform.changes 2014-11-26 20:55:26.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Oct 27 17:09:53 UTC 2014 - peter.trommler@ohm-hochschule.de + +- fix requires version number for cabal-install + +------------------------------------------------------------------- +Sat Oct 18 15:30:17 UTC 2014 - peter.trommler@ohm-hochschule.de + +- fix Requires for happy (wrong version) + +------------------------------------------------------------------- +Fri Sep 12 07:00:07 UTC 2014 - peter.trommler@ohm-hochschule.de + +- update to 2014.2.0.0 +- add unknown-buildtool.patch +* fix detection of hscolour version +* remove cabal-install detection (unknown buildtool error) +- enable build on ppc64 and ppc64le + +------------------------------------------------------------------- Old: ---- haskell-platform-2013.2.0.0.tar.gz New: ---- haskell-platform-2014.2.0.0-srcdist.tar.gz unknown-buildtool.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ haskell-platform.spec ++++++ --- /var/tmp/diff_new_pack.o9Y1Tj/_old 2014-11-26 20:55:27.000000000 +0100 +++ /var/tmp/diff_new_pack.o9Y1Tj/_new 2014-11-26 20:55:27.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package haskell-platform # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,17 +28,17 @@ # ghci (ghc library) is not officially part of Haskell Platform %define platform_progs()\ -%{?1}Requires: ghc-compiler = 7.6.3\ -%{?1}Requires: cabal-install = 1.16.0.2\ -%{?1}Requires: alex = 3.0.5\ -%{?1}Requires: happy = 1.18.10\ +%{?1}Requires: ghc-compiler = 7.8.3\ +%{?1}Requires: cabal-install = 1.18.0.5\ +%{?1}Requires: alex = 3.1.3\ +%{?1}Requires: happy = 1.19.4\ %{?1}Requires: hscolour = 1.20.3\ %{nil} -%global platform_progs_versions ghc-compiler = 7.6.3 cabal-install = 1.16.0.2 alex = 3.0.5 happy = 1.18.10 hscolour = 1.20.3 +%global platform_progs_versions ghc-compiler = 7.8.3 cabal-install = 1.18.0.5 alex = 3.1.3 happy = 1.19.4 hscolour = 1.20.3 Name: haskell-platform -Version: 2013.2.0.0 +Version: 2014.2.0.0 Release: 0 Summary: Standard Haskell distribution License: BSD-3-Clause @@ -46,31 +46,32 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build # BEGIN cabal2spec Url: http://hackage.haskell.org/platform -Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz -ExclusiveArch: %{ix86} x86_64 ppc +Source0: http://www.haskell.org/platform/download/%{version}/%{name}-%{version}-srcdist.tar.gz +# PATCH-FIX-OPENSUSE unknown-buildtool.patch peter.trommler@ohm-hochschule.de -- depending on cabal-install results in Unknown build tool error +Patch: unknown-buildtool.patch + BuildRequires: %{platform_progs_versions} BuildRequires: ghc-Cabal-devel -BuildRequires: ghc-GLURaw-devel = 1.3.0.0 -BuildRequires: ghc-GLUT-devel = 2.4.0.0 -BuildRequires: ghc-HTTP-devel = 4000.2.8 +BuildRequires: ghc-GLURaw-devel = 1.4.0.1 +BuildRequires: ghc-GLUT-devel = 2.5.1.1 +BuildRequires: ghc-HTTP-devel = 4000.2.10 BuildRequires: ghc-HUnit-devel = 1.2.5.2 -BuildRequires: ghc-OpenGL-devel = 2.8.0.0 -BuildRequires: ghc-OpenGLRaw-devel = 1.3.0.0 +BuildRequires: ghc-OpenGL-devel = 2.9.2.0 +BuildRequires: ghc-OpenGLRaw-devel = 1.5.0.0 BuildRequires: ghc-QuickCheck-devel = 2.6 -BuildRequires: ghc-async-devel = 2.0.1.4 +BuildRequires: ghc-async-devel = 2.0.1.5 BuildRequires: ghc-attoparsec-devel = 0.10.4.0 -BuildRequires: ghc-case-insensitive-devel = 1.0.0.1 -BuildRequires: ghc-cgi-devel = 3001.1.7.5 -BuildRequires: ghc-fgl-devel = 5.4.2.4 -BuildRequires: ghc-hashable-devel = 1.1.2.5 -BuildRequires: ghc-haskell-src-devel = 1.0.1.5 +BuildRequires: ghc-case-insensitive-devel = 1.1.0.3 +BuildRequires: ghc-fgl-devel = 5.5.0.1 +BuildRequires: ghc-hashable-devel = 1.2.2.0 +BuildRequires: ghc-haskell-src-devel = 1.0.1.6 BuildRequires: ghc-html-devel = 1.0.1.2 -BuildRequires: ghc-libraries = 7.6.3 -BuildRequires: ghc-mtl-devel = 2.1.2 -BuildRequires: ghc-network-devel = 2.4.1.2 -BuildRequires: ghc-parallel-devel = 3.2.0.3 -BuildRequires: ghc-parsec-devel = 3.1.3 -BuildRequires: ghc-primitive = 0.5.0.1 +BuildRequires: ghc-libraries = 7.8.3 +BuildRequires: ghc-mtl-devel = 2.1.3.1 +BuildRequires: ghc-network-devel = 2.4.2.3 +BuildRequires: ghc-parallel-devel = 3.2.0.4 +BuildRequires: ghc-parsec-devel = 3.1.5 +BuildRequires: ghc-primitive = 0.5.2.1 BuildRequires: ghc-random-devel = 1.0.1.1 BuildRequires: ghc-regex-base-devel = 0.93.2 BuildRequires: ghc-regex-compat-devel = 0.95.1 @@ -78,11 +79,10 @@ BuildRequires: ghc-rpm-macros BuildRequires: ghc-split-devel = 0.2.2 BuildRequires: ghc-stm-devel = 2.4.2 -BuildRequires: ghc-syb-devel = 0.4.0 -BuildRequires: ghc-text-devel = 0.11.3.1 -BuildRequires: ghc-transformers-devel = 0.3.0.0 -BuildRequires: ghc-unordered-containers-devel = 0.2.3.0 -BuildRequires: ghc-vector-devel = 0.10.0.1 +BuildRequires: ghc-syb-devel = 0.4.1 +BuildRequires: ghc-text-devel = 1.1.0.0 +BuildRequires: ghc-unordered-containers-devel = 0.2.4.0 +BuildRequires: ghc-vector-devel = 0.10.9.1 BuildRequires: ghc-xhtml-devel = 3000.2.1 BuildRequires: ghc-zlib-devel = 0.5.4.1 # END cabal2spec @@ -99,39 +99,37 @@ Requires(post): ghc-compiler Requires(postun): ghc-compiler Requires: %{name} = %{version}-%{release} -# order here follows http://hackage.haskell.org/platform/changelog.html -Requires: ghc-GLURaw-devel = 1.3.0.0 -Requires: ghc-GLUT-devel = 2.4.0.0 -Requires: ghc-HTTP-devel = 4000.2.8 +Requires: ghc-GLURaw-devel = 1.4.0.1 +Requires: ghc-GLUT-devel = 2.5.1.1 +Requires: ghc-HTTP-devel = 4000.2.10 Requires: ghc-HUnit-devel = 1.2.5.2 -Requires: ghc-OpenGL-devel = 2.8.0.0 -Requires: ghc-OpenGLRaw-devel = 1.3.0.0 +Requires: ghc-OpenGL-devel = 2.9.2.0 +Requires: ghc-OpenGLRaw-devel = 1.5.0.0 Requires: ghc-QuickCheck-devel = 2.6 -Requires: ghc-async-devel = 2.0.1.4 +Requires: ghc-async-devel = 2.0.1.5 Requires: ghc-attoparsec-devel = 0.10.4.0 -Requires: ghc-case-insensitive-devel = 1.0.0.1 -Requires: ghc-cgi-devel = 3001.1.7.5 -Requires: ghc-fgl-devel = 5.4.2.4 -Requires: ghc-hashable-devel = 1.1.2.5 -Requires: ghc-haskell-src-devel = 1.0.1.5 +Requires: ghc-case-insensitive-devel = 1.1.0.3 +Requires: ghc-fgl-devel = 5.5.0.1 +Requires: ghc-hashable-devel = 1.2.2.0 +Requires: ghc-haskell-src-devel = 1.0.1.6 Requires: ghc-html-devel = 1.0.1.2 -Requires: ghc-libraries = 7.6.3 -Requires: ghc-mtl-devel = 2.1.2 -Requires: ghc-network-devel = 2.4.1.2 -Requires: ghc-parallel-devel = 3.2.0.3 -Requires: ghc-parsec-devel = 3.1.3 -Requires: ghc-primitive = 0.5.0.1 +Requires: ghc-libraries = 7.8.3 +Requires: ghc-mtl-devel = 2.1.3.1 +Requires: ghc-network-devel = 2.4.2.3 +Requires: ghc-parallel-devel = 3.2.0.4 +Requires: ghc-parsec-devel = 3.1.5 +Requires: ghc-primitive = 0.5.2.1 Requires: ghc-random-devel = 1.0.1.1 Requires: ghc-regex-base-devel = 0.93.2 Requires: ghc-regex-compat-devel = 0.95.1 Requires: ghc-regex-posix-devel = 0.95.2 +Requires: ghc-rpm-macros Requires: ghc-split-devel = 0.2.2 Requires: ghc-stm-devel = 2.4.2 -Requires: ghc-syb-devel = 0.4.0 -Requires: ghc-text-devel = 0.11.3.1 -Requires: ghc-transformers-devel = 0.3.0.0 -Requires: ghc-unordered-containers-devel = 0.2.3.0 -Requires: ghc-vector-devel = 0.10.0.1 +Requires: ghc-syb-devel = 0.4.1 +Requires: ghc-text-devel = 1.1.0.0 +Requires: ghc-unordered-containers-devel = 0.2.4.0 +Requires: ghc-vector-devel = 0.10.9.1 Requires: ghc-xhtml-devel = 3000.2.1 Requires: ghc-zlib-devel = 0.5.4.1 @@ -143,20 +141,22 @@ %prep %setup -q -n %{name}-%{version} +%patch -p1 %build -cd %{top_prefix} +# cd %{top_prefix} +cp hptool/Setup.hs . %ghc_lib_build %install -TOPDIR=$(pwd) -cd %{top_prefix} +# TOPDIR=$(pwd) +# cd %{top_prefix} %ghc_lib_install -mv ghc-%{name}-devel.files $TOPDIR -if [ -e debugsources.list ]; then - mv debugsources.list $TOPDIR; -fi +# mv ghc-%{name}-devel.files $TOPDIR +# if [ -e debugsources.list ]; then +# mv debugsources.list $TOPDIR; +# fi %post -n ghc-%{pkg_name}-devel %ghc_pkg_recache @@ -166,10 +166,11 @@ %files -n ghc-%{pkg_name}-devel -f ghc-%{pkg_name}-devel.files %defattr(-,root,root,-) -%doc %{top_prefix}/LICENSE +# %doc %{top_prefix}/LICENSE %files %defattr(-,root,root,-) -%doc %{top_prefix}/LICENSE +%doc LICENSE +# %doc %{top_prefix}/LICENSE %changelog ++++++ unknown-buildtool.patch ++++++ Index: haskell-platform-2014.2.0.0/haskell-platform.cabal =================================================================== --- haskell-platform-2014.2.0.0.orig/haskell-platform.cabal +++ haskell-platform-2014.2.0.0/haskell-platform.cabal @@ -103,7 +103,6 @@ library -- 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 + hscolour ==1.20 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de