[haskell-platform] cabal-install, happy, parallel, regex-compat now separate packages again
Jens Petersen
petersen at fedoraproject.org
Fri Apr 18 01:17:21 UTC 2014
commit 5855007bfd4bd87e219c53b4e2e98557fdb7c143
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Apr 18 10:17:02 2014 +0900
cabal-install, happy, parallel, regex-compat now separate packages again
cabal-install-quieter-selfupgrade.patch | 21 ------
cabal-install.sh | 8 ---
haskell-platform.spec | 102 +++++++------------------------
3 files changed, 22 insertions(+), 109 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index dc7d06f..e240f6e 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -10,10 +10,12 @@
%global html_version 1.0.1.2
%global mtl_version 2.1.2
%global network_version 2.4.1.2
+%global parallel_version 3.2.0.3
%global parsec_version 3.1.3
%global QuickCheck_version 2.6
%global random_version 1.0.1.1
%global regex_base_version 0.93.2
+%global regex_compat_version 0.95.1
%global regex_posix_version 0.95.2
%global stm_version 2.4.2
%global text_version 0.11.3.1
@@ -30,7 +32,7 @@
%global hashable_version 1.1.2.5
%global unordered_containers_version 0.2.3.0
-%global separate_packages HUnit|QuickCheck|HTTP|html|mtl|network|parsec|random|regex-base|regex-posix|stm|text|transformers|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
+%global separate_packages QuickCheck|HTTP|HUnit|cabal-install|happy|html|mtl|network|parallel|parsec|random|regex-base|regex-compat|regex-posix|stm|text|transformers|zlib|async|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
Name: haskell-platform
Version: 2013.2.0.0
@@ -38,7 +40,7 @@ Version: 2013.2.0.0
# - release can only be reset if all library versions get bumped simultaneously
# (eg for a major release)
# - minor release numbers should be incremented monotonically
-Release: 33%{?dist}
+Release: 34%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
@@ -46,7 +48,6 @@ License: BSD
URL: http://hackage.haskell.org/platform
Source0: http://lambda.haskell.org/platform/download/%{version}/%{name}-%{version}.tar.gz
Patch2: alex-ghc74-fix-bang-pattern.patch
-Patch3: cabal-install-quieter-selfupgrade.patch
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros-extra
@@ -65,10 +66,12 @@ BuildRequires: ghc-HTTP-devel = %{HTTP_version}
BuildRequires: ghc-html-devel = %{html_version}
BuildRequires: ghc-mtl-devel = %{mtl_version}
BuildRequires: ghc-network-devel = %{network_version}
+BuildRequires: ghc-parallel-devel = %{parallel_version}
BuildRequires: ghc-parsec-devel = %{parsec_version}
BuildRequires: ghc-QuickCheck-devel = %{QuickCheck_version}
BuildRequires: ghc-random-devel = %{random_version}
BuildRequires: ghc-regex-base-devel = %{regex_base_version}
+BuildRequires: ghc-regex-compat-devel = %{regex_compat_version}
BuildRequires: ghc-regex-posix-devel = %{regex_posix_version}
BuildRequires: ghc-stm-devel = %{stm_version}
%ifarch %{ghc_arches_with_ghci}
@@ -91,9 +94,9 @@ BuildRequires: ghc-unordered-containers-devel = %{unordered_containers_version}
# ghci "ghc" library is not officially part of hackage-platform
Requires: ghc-compiler = %{ghc_compiler_version}
-Requires: alex = %{alex_version}-%{release}
-Requires: cabal-install = %{cabal_install_version}-%{release}
-Requires: happy = %{happy_version}-%{release}
+Requires: alex = %{alex_version}
+Requires: cabal-install = %{cabal_install_version}
+Requires: happy = %{happy_version}
Requires: ghc-haskell-platform-devel = %{version}-%{release}
%description
@@ -110,12 +113,13 @@ and tools. It provides a good starting environment for Haskell development.
%ghc_lib_subpackage fgl 5.4.2.4
%ghc_lib_subpackage -c mesa-libGLU-devel%{?_isa} GLURaw 1.3.0.0
%ghc_lib_subpackage -c freeglut-devel%{?_isa} GLUT 2.4.0.0
+# used by lambdabot-utils
%ghc_lib_subpackage haskell-src 1.0.1.5
%ghc_lib_subpackage OpenGL 2.8.0.0
%ghc_lib_subpackage -c mesa-libGL-devel%{?_isa} OpenGLRaw 1.3.0.0
-%ghc_lib_subpackage parallel 3.2.0.3
-%ghc_lib_subpackage regex-compat 0.95.1
+# rhbz#1049202
%ghc_lib_subpackage syb 0.4.0
+# exposed in ghc-7.8
%ghc_lib_subpackage xhtml 3000.2.1
%endif
@@ -137,41 +141,6 @@ description of the tokens to be recognised in the form of regular
expressions. It is similar to the tool lex or flex for C/C++.
-%package -n cabal-install
-Version: %{cabal_install_version}
-Summary: Haskell package tool
-Group: Development/Tools
-License: BSD
-URL: http://hackage.haskell.org/package/%{name}
-Source1: cabal-install.sh
-Requires: ghc-compiler
-
-%description -n cabal-install
-The 'cabal' command-line program simplifies the process of managing Haskell
-packages by automating fetching, configuration, compilation and
-installation of Haskell libraries and programs from Hackage.
-
-
-%package -n happy
-Version: %{happy_version}
-Summary: LALR(1) Parser Generator for Haskell
-License: BSD
-Group: Development/Tools
-URL: http://hackage.haskell.org/package/happy
-BuildRequires: autoconf, docbook-dtds, docbook-style-xsl, libxslt, libxml2
-
-%description -n happy
-Happy is a parser generator system for Haskell, similar to the tool
-`yacc' for C. Like `yacc', it takes a file containing an annotated BNF
-specification of a grammar and produces a Haskell module containing a
-parser for the grammar.
-
-Happy is flexible: you can have several Happy parsers in the same
-program, and several entry points to a single grammar. Happy can work
-in conjunction with a lexical analyser supplied by the user (either
-hand-written or generated by another program).
-
-
%global version %{haskell_platform_version}
%package -n ghc-haskell-platform-devel
@@ -187,10 +156,12 @@ Requires: ghc-HTTP-devel = %{HTTP_version}
Requires: ghc-html-devel = %{html_version}
Requires: ghc-mtl-devel = %{mtl_version}
Requires: ghc-network-devel = %{network_version}
+Requires: ghc-parallel-devel = %{parallel_version}
Requires: ghc-parsec-devel = %{parsec_version}
Requires: ghc-QuickCheck-devel = %{QuickCheck_version}
Requires: ghc-random-devel = %{random_version}
Requires: ghc-regex-base-devel = %{regex_base_version}
+Requires: ghc-regex-compat-devel = %{regex_compat_version}
Requires: ghc-regex-posix-devel = %{regex_posix_version}
Requires: ghc-stm-devel = %{stm_version}
Requires: ghc-text-devel = %{text_version}
@@ -224,10 +195,6 @@ cd alex-%{alex_version}
cd ..
%endif
-cd cabal-install-%{cabal_install_version}
-%patch3 -p1 -b .orig
-cd ..
-
cd ..
@@ -253,7 +220,7 @@ alex|cabal-install|happy)
#./Setup register --inplace
#;;
haskell-platform)
-cabal_configure_extra_options="--with-cabal-install=../cabal-install-%{cabal_install_version}/dist/build/cabal/cabal --with-happy=../happy-%{happy_version}/dist/build/happy/happy --with-alex=../alex-%{alex_version}/dist/build/alex/alex"
+cabal_configure_extra_options="--with-alex=../alex-%{alex_version}/dist/build/alex/alex"
%ghc_lib_build_without_haddock $name $ver
cabal_configure_extra_options=
;;
@@ -266,7 +233,7 @@ cd ..
done
# build alex documentation
-for i in alex-%{alex_version} happy-%{happy_version}; do
+for i in alex-%{alex_version}; do
cd $i/doc
autoreconf
%configure
@@ -280,8 +247,6 @@ PATH=$HOME/.cabal/bin:$PATH
cd packages
-PACKAGES_DIR=$PWD
-
for i in $(egrep -v "^(%{?separate_packages})-" platform.packages); do
name=$(echo $i | sed -e "s/\(.*\)-.*/\1/")
ver=$(echo $i | sed -e "s/.*-\(.*\)/\1/")
@@ -300,19 +265,12 @@ esac
cd ..
done
-cd cabal-install-%{cabal_install_version}
-mkdir -p %{buildroot}%{_sysconfdir}/bash_completion.d
-cp -p bash-completion/cabal %{buildroot}%{_sysconfdir}/bash_completion.d
-mkdir -p %{buildroot}%{_sysconfdir}/profile.d
-install -pm 644 %{SOURCE1} %{buildroot}%{_sysconfdir}/profile.d
-
-# fix RPATHs in programs linking to HP user libs
-%ghc_fix_dynamic_rpath alex cabal happy
-cd ..
-
mv */*.files ..
cd ..
+# fix RPATHs in programs linking to HP user libs
+%ghc_fix_dynamic_rpath alex
+
%ghc_strip_dynlinked
# need versioned docdir's here for F19!
@@ -349,26 +307,10 @@ fi
%{_datadir}/alex-%{alex_version}
-%files -n cabal-install
-%doc packages/cabal-install-%{cabal_install_version}/LICENSE
-%doc packages/cabal-install-%{cabal_install_version}/README
-%{_bindir}/cabal
-%{_sysconfdir}/bash_completion.d
-%{_sysconfdir}/profile.d/cabal-install.sh
-
-
-%files -n happy
-%doc packages/happy-%{happy_version}/ANNOUNCE
-%doc packages/happy-%{happy_version}/CHANGES
-%doc packages/happy-%{happy_version}/LICENSE
-%doc packages/happy-%{happy_version}/README
-%doc packages/happy-%{happy_version}/TODO
-%doc packages/happy-%{happy_version}/doc/happy
-%{_bindir}/happy
-%{_datadir}/happy-%{happy_version}
-
-
%changelog
+* Mon Apr 14 2014 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-34
+- cabal-install, happy, parallel, regex-compat are now separate packages
+
* Thu Mar 27 2014 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-33
- transformers lib is now separate package
More information about the scm-commits
mailing list