From e3b9e6ba9f0be5b95f3360c2069d67456288028cdb66c1d07d8e3df0813425ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 14 Oct 2016 20:37:54 +0000 Subject: [PATCH] revmove old cabal OBS-URL: https://build.opensuse.org/package/show/devel:languages:haskell/ghc?expand=0&rev=231 --- ghc.changes | 5 +++++ ghc.spec | 48 ++++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/ghc.changes b/ghc.changes index c7da2fc..460ba06 100644 --- a/ghc.changes +++ b/ghc.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Oct 14 20:34:46 UTC 2016 - mimi.vx@gmail.com + +- make compatible with new ghc-rpm-macros + ------------------------------------------------------------------- Wed Sep 28 14:16:09 UTC 2016 - peter.trommler@ohm-hochschule.de diff --git a/ghc.spec b/ghc.spec index 11dbd40..af225c9 100644 --- a/ghc.spec +++ b/ghc.spec @@ -117,30 +117,30 @@ To install all of GHC install package ghc. %global ghc_pkg_c_deps ghc-compiler = %{ghc_version_override}-%{release} %if %{defined ghclibdir} -%ghc_lib_subpackage Cabal 1.24.0.0 -%ghc_lib_subpackage array 0.5.1.1 -%ghc_lib_subpackage -c gmp-devel,libffi-devel,libdw-devel,libelf-devel base 4.9.0.0 -%ghc_lib_subpackage binary 0.8.3.0 -%ghc_lib_subpackage bytestring 0.10.8.1 -%ghc_lib_subpackage containers 0.5.7.1 -%ghc_lib_subpackage deepseq 1.4.2.0 -%ghc_lib_subpackage directory 1.2.6.2 -%ghc_lib_subpackage filepath 1.4.1.0 -%ghc_lib_subpackage -x ghc %{ghc_version_override} -%ghc_lib_subpackage ghc-boot %{ghc_version_override} -%ghc_lib_subpackage ghc-boot-th %{ghc_version_override} -%ghc_lib_subpackage -x ghci %{ghc_version_override} -%ghc_lib_subpackage haskeline 0.7.2.3 -%ghc_lib_subpackage hoopl 3.10.2.1 -%ghc_lib_subpackage hpc 0.6.0.3 -%ghc_lib_subpackage pretty 1.1.3.3 -%ghc_lib_subpackage process 1.4.2.0 -%ghc_lib_subpackage template-haskell 2.11.0.0 -%ghc_lib_subpackage -c ncurses-devel terminfo 0.4.0.2 -%ghc_lib_subpackage time 1.6.0.1 -%ghc_lib_subpackage transformers 0.5.2.0 -%ghc_lib_subpackage unix 2.7.2.0 -%ghc_lib_subpackage xhtml 3000.2.1 +%ghc_lib_subpackage Cabal-1.24.0.0 +%ghc_lib_subpackage array-0.5.1.1 +%ghc_lib_subpackage -c gmp-devel,libffi-devel,libdw-devel,libelf-devel base-4.9.0.0 +%ghc_lib_subpackage binary-0.8.3.0 +%ghc_lib_subpackage bytestring-0.10.8.1 +%ghc_lib_subpackage containers-0.5.7.1 +%ghc_lib_subpackage deepseq-1.4.2.0 +%ghc_lib_subpackage directory-1.2.6.2 +%ghc_lib_subpackage filepath-1.4.1.0 +%ghc_lib_subpackage -x ghc-%{ghc_version_override} +%ghc_lib_subpackage ghc-boot-%{ghc_version_override} +%ghc_lib_subpackage ghc-boot-th-%{ghc_version_override} +%ghc_lib_subpackage -x ghci-%{ghc_version_override} +%ghc_lib_subpackage haskeline-0.7.2.3 +%ghc_lib_subpackage hoopl-3.10.2.1 +%ghc_lib_subpackage hpc-0.6.0.3 +%ghc_lib_subpackage pretty-1.1.3.3 +%ghc_lib_subpackage process-1.4.2.0 +%ghc_lib_subpackage template-haskell-2.11.0.0 +%ghc_lib_subpackage -c ncurses-devel terminfo-0.4.0.2 +%ghc_lib_subpackage time-1.6.0.1 +%ghc_lib_subpackage transformers-0.5.2.0 +%ghc_lib_subpackage unix-2.7.2.0 +%ghc_lib_subpackage xhtml-3000.2.1 %endif %global version %{ghc_version_override}