diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index af77bc4..6497aac 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -10,8 +10,8 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.6.2 -Release: 4%{?dist} +Version: 1.6.3 +Release: 1%{?dist} Summary: RPM macros for building packages for GHC License: GPLv3+ @@ -135,6 +135,9 @@ EOF %changelog +* Sat Aug 6 2016 Jens Petersen - 1.6.3-1 +- cabal_verbose from github fedora-haskell/ghc-rpm-macros + * Fri Jul 22 2016 Jens Petersen - 1.6.2-4 - try obsoleting Agda diff --git a/macros.ghc b/macros.ghc index aa01fe6..4824db9 100644 --- a/macros.ghc +++ b/macros.ghc @@ -25,15 +25,15 @@ fi %global _hardened_ldflags %{nil}\ CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure %{?cabal_verbose} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_pkgdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options # install -%cabal_install %cabal copy --destdir=%{buildroot} -v +%cabal_install %cabal copy %{?cabal_verbose} %{!?cabal_verbose:-v} --destdir=%{buildroot} # tests %cabal_test\ %if %{with tests}\ -%cabal test\ +%cabal test %{?cabal_verbose}\ %endif # no _pkgdocdir in EPEL <= 7 @@ -104,13 +104,13 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf. %ghc_bin_build\ %global debug_package %{nil}\ %cabal_configure\ -%cabal build +%cabal build %{_smp_mflags} %{?cabal_verbose} # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ %global debug_package %{nil}\ %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?ghc_without_shared:--disable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ -%cabal build\ +%cabal build %{_smp_mflags} %{?cabal_verbose}\ %{nil} # ghc_lib_build [name] [version]