[ghc-rpm-macros] add %ghc_docdir for package's docdir
Jens Petersen
petersen at fedoraproject.org
Fri Jul 26 05:34:48 UTC 2013
commit 8bc7b06720f0c27351c1210800b7c8e06d72c3bb
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Jul 26 14:34:17 2013 +0900
add %ghc_docdir for package's docdir
I think rpm or at least redhat-rpm-config should provide such a macro
ghc-rpm-macros.ghc | 4 +++-
ghc-rpm-macros.spec | 5 ++++-
2 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index 3afbd90..4dbfdba 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -21,11 +21,13 @@ fi
# configure
%cabal_configure\
%ghc_check_bootstrap\
-%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_docdir}/%{name} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
+%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{ghc_docdir} --libsubdir='$compiler/$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?cabal_configure_options} $cabal_configure_extra_options
# install
%cabal_install %cabal copy --destdir=%{buildroot} -v
+# F20 has unversioned docdir's
+%ghc_docdir %{_docdir}/%{name}
# root dir for ghc docs
%ghcdocbasedir %{_docdir}/ghc/html
# libraries doc dir
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 6e5eaa2..996515e 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -6,7 +6,7 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
-Version: 1.0.6
+Version: 1.0.7
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
@@ -90,6 +90,9 @@ EOF
%changelog
+* Fri Jul 26 2013 Jens Petersen <petersen at redhat.com> - 1.0.7-1
+- add ghc_docdir for package's docdir since not provided by standard macros
+
* Fri Jul 26 2013 Jens Petersen <petersen at redhat.com> - 1.0.6-1
- also make %ghc_lib_build docdir unversioned
- require redhat-rpm-config >= 9.1.0-50.fc20 for unversioned docdir
More information about the scm-commits
mailing list