random and stm are separate packages again

This commit is contained in:
Jens Petersen 2013-10-30 13:03:45 +09:00
parent 10870b0f2d
commit d62b08d2d1
2 changed files with 17 additions and 11 deletions

View File

@ -1 +0,0 @@
ghc-transformers ghc-html ghc-HUnit ghc-OpenGL ghc-random ghc-stm ghc-syb ghc-xhtml ghc-zlib : ghc-mtl ghc-GLUT ghc-parallel ghc-text : ghc-fgl ghc-parsec ghc-QuickCheck ghc-regex-base happy : alex ghc-haskell-src ghc-network ghc-regex-posix : ghc-regex-compat ghc-cgi ghc-HTTP : cabal-install :

View File

@ -5,6 +5,8 @@
%global cabal_install_version 1.16.0.2
%global happy_version 1.18.10
%global random_version 1.0.1.1
%global stm_version 2.4.2
%global text_version 0.11.3.1
# 2012.4
%global primitive_version 0.5.0.1
@ -16,7 +18,7 @@
%global hashable_version 1.1.2.5
%global unordered_containers_version 0.2.3.0
%global separate_packages text|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
%global separate_packages stm|text|primitive|split|vector|attoparsec|case-insensitive|hashable|unordered-containers
Name: haskell-platform
Version: 2013.2.0.0
@ -24,7 +26,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: 24%{?dist}
Release: 25%{?dist}
Summary: Standard Haskell distribution
Group: Development/Tools
@ -56,6 +58,8 @@ BuildRequires: ghc-time-devel
BuildRequires: ghc-bytestring-devel
# zlib
BuildRequires: zlib-devel%{?_isa}
BuildRequires: ghc-random-devel = %{random_version}
BuildRequires: ghc-stm-devel = %{stm_version}
BuildRequires: ghc-text-devel = %{text_version}
# part of HP-2012.4
BuildRequires: ghc-split-devel = %{split_version}
@ -100,11 +104,9 @@ and tools. It provides a good starting environment for Haskell development.
%ghc_lib_subpackage parallel 3.2.0.3
%ghc_lib_subpackage parsec 3.1.3
%ghc_lib_subpackage QuickCheck 2.6
%ghc_lib_subpackage -l %BSDHaskellReport random 1.0.1.1
%ghc_lib_subpackage regex-base 0.93.2
%ghc_lib_subpackage regex-compat 0.95.1
%ghc_lib_subpackage regex-posix 0.95.2
%ghc_lib_subpackage stm 2.4.2
%ghc_lib_subpackage syb 0.4.0
%ghc_lib_subpackage transformers 0.3.0.0
%ghc_lib_subpackage xhtml 3000.2.1
@ -172,6 +174,8 @@ Requires(post): ghc-compiler = %{ghc_version}
Requires(postun): ghc-compiler = %{ghc_version}
%{?ghc_packages_list:Requires: %(echo %{ghc_packages_list} | sed -e "s/\([^ ]*\)-\([^ ]*\)/ghc-\1-devel = \2-%{release},/g")}
Requires: ghc-libraries = %{ghc_compiler_version}
Requires: ghc-random-devel = %{random_version}
Requires: ghc-stm-devel = %{stm_version}
Requires: ghc-text-devel = %{text_version}
# part of HP-2012.4
Requires: ghc-primitive-devel = %{primitive_version}
@ -261,6 +265,8 @@ alex|cabal-install|happy)
;;
*)
%ghc_lib_install $name $ver
# for ghc-7.8
#%%ghc_gen_filelists $name $ver
echo "%doc packages/$name-$ver/LICENSE" >> ghc-$name.files
;;
esac
@ -268,15 +274,13 @@ cd ..
done
cd cabal-install-%{cabal_install_version}
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
cp -p bash-completion/cabal $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/profile.d
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
%if %{undefined ghc_without_dynamic}
%ghc_fix_dynamic_rpath alex cabal happy
%endif
cd ..
mv */*.files ..
@ -339,6 +343,9 @@ mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit/
%changelog
* Sat Oct 26 2013 Jens Petersen <petersen@redhat.com> - 2013.2.0.0-25
- random and stm are separate packages again
* Fri Jul 26 2013 Jens Petersen <petersen@redhat.com> - 2013.2.0.0-24
- fix packaging of license files when building without shared libraries
- tweaks for F20 unversioned docdir