[ghc-json] drop ghc_pkg_deps and just BR ghc-Cabal-devel and ghc-mtl-prof
Jens Petersen
petersen at fedoraproject.org
Wed May 11 06:41:58 UTC 2011
commit 18e411002c46d3d7225dfbd167d88a2dc9867662
Author: Jens Petersen <petersen at redhat.com>
Date: Wed May 11 15:41:45 2011 +0900
drop ghc_pkg_deps and just BR ghc-Cabal-devel and ghc-mtl-prof
ghc-json.spec | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
---
diff --git a/ghc-json.spec b/ghc-json.spec
index 9d1fc80..090d16a 100644
--- a/ghc-json.spec
+++ b/ghc-json.spec
@@ -11,12 +11,9 @@
%global common_description This library provides a parser and pretty printer for converting\
between Haskell values and JSON.
-# Haskell library dependencies (used for buildrequires and devel/prof subpkg requires)
-%global ghc_pkg_deps ghc-mtl-devel
-
Name: ghc-%{pkg_name}
Version: 0.4.4
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: %{common_summary}
Group: System Environment/Libraries
@@ -25,11 +22,11 @@ URL: http://hackage.haskell.org/package/%{pkg_name}
Source0: http://hackage.haskell.org/packages/archive/%{pkg_name}/%{version}/%{pkg_name}-%{version}.tar.gz
# fedora ghc archs:
ExclusiveArch: %{ix86} x86_64 ppc alpha sparcv9 ppc64
-BuildRequires: ghc, ghc-doc, ghc-prof
+BuildRequires: ghc-Cabal-devel
# macros for building haskell packages
BuildRequires: ghc-rpm-macros
BuildRequires: hscolour
-%{?ghc_pkg_deps:BuildRequires: %{ghc_pkg_deps}, %(echo %{ghc_pkg_deps} | sed -e "s/\(ghc-[^, ]\+\)-devel/\1-doc,\1-prof/g")}
+BuildRequires: ghc-mtl-prof
%description
%{common_description}
@@ -47,18 +44,17 @@ BuildRequires: hscolour
%ghc_lib_install
-%check
-# assumes QuickCheck1
-#cd tests
-#make all
-
-
-# define the devel and prof subpkgs, devel post[un] scripts, and filelists:
-# ghc-%pkg_name{,devel,prof}.files
+# define the devel and prof subpkgs, devel post[un] scripts,
+# and filelists: ghc-json{,devel,prof}.files
%ghc_lib_package
%changelog
+* Wed May 11 2011 Jens Petersen <petersen at redhat.com> - 0.4.4-2
+- drop ghc_pkg_deps and just BR ghc-Cabal-devel and ghc-mtl-prof
+- fix rpmlint warning about pkg_name macro in comment
+- drop check section since tests assume QuickCheck 1
+
* Tue May 3 2011 Jens Petersen <petersen at redhat.com> - 0.4.4-1
- BSD license
More information about the scm-commits
mailing list