[shake] rename testsuite bcond to tests; latest ghc-rpm-macros sets --enable-tests
Jens Petersen
petersen at fedoraproject.org
Fri May 16 14:55:14 UTC 2014
commit cc8eee5dcb3d96497f1596433ee2ca2435479b83
Author: Jens Petersen <petersen at redhat.com>
Date: Fri May 16 23:55:02 2014 +0900
rename testsuite bcond to tests; latest ghc-rpm-macros sets --enable-tests
shake.spec | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
---
diff --git a/shake.spec b/shake.spec
index c6c5d55..251b16d 100644
--- a/shake.spec
+++ b/shake.spec
@@ -1,10 +1,13 @@
# https://fedoraproject.org/wiki/Packaging:Haskell
+%global pkg_name shake
+
%ifarch %{ix86} x86_64
-%bcond_without testsuite
+%bcond_without tests
%endif
-%global pkg_name shake
+# no useful debuginfo for Haskell packages without C sources
+%global debug_package %{nil}
Name: %{pkg_name}
Version: 0.11.4
@@ -13,7 +16,7 @@ Summary: Make-like build system
License: BSD
URL: http://hackage.haskell.org/package/%{name}
-Source0: http://hackage.haskell.org/packages/archive/%{name}/%{version}/%{name}-%{version}.tar.gz
+Source0: http://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-rpm-macros
@@ -32,10 +35,10 @@ BuildRequires: ghc-transformers-devel
BuildRequires: ghc-unix-devel
BuildRequires: ghc-unordered-containers-devel
BuildRequires: ghc-utf8-string-devel
-# End cabal-rpm deps
-%if %{with testsuite}
+%if %{with tests}
BuildRequires: ghc-QuickCheck-devel
%endif
+# End cabal-rpm deps
BuildRequires: dos2unix
%description
@@ -90,9 +93,6 @@ done
%build
-%if %{with testsuite}
-%global cabal_configure_options --enable-tests
-%endif
%ghc_lib_build
@@ -105,7 +105,7 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/html/*
%check
-%if %{with testsuite}
+%if %{with tests}
%cabal test
%endif
@@ -132,6 +132,9 @@ rm %{buildroot}%{_datadir}/%{name}-%{version}/html/*
%changelog
+* Fri May 16 2014 Jens Petersen <petersen at redhat.com> - 0.11.4-3
+- adapt to new tests bcond in ghc-rpm-macros
+
* Mon Apr 14 2014 Jens Petersen <petersen at redhat.com> - 0.11.4-3
- use global to define cabal_configure_options (#1082515)
More information about the scm-commits
mailing list