[ghc-rpm-macros/f20] ghcpkgdocdir should be versioned for F20 and earlier
Jens Petersen
petersen at fedoraproject.org
Fri Oct 25 08:10:34 UTC 2013
commit c3e1d45228a59650d247aa5b5c49fad469d2d52d
Author: Jens Petersen <petersen at redhat.com>
Date: Fri Oct 25 17:09:26 2013 +0900
ghcpkgdocdir should be versioned for F20 and earlier
ghc-rpm-macros.ghc | 2 +-
ghc-rpm-macros.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ghc-rpm-macros.ghc b/ghc-rpm-macros.ghc
index af76a77..0a2b565 100644
--- a/ghc-rpm-macros.ghc
+++ b/ghc-rpm-macros.ghc
@@ -31,7 +31,7 @@ fi
# libraries doc dir
%ghclibdocdir %{ghcdocbasedir}/libraries
# pkg doc dir
-%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name}
+%ghcpkgdocdir %{ghcdocbasedir}/libraries/%{pkg_name}-%{version}
# top library dir
%ghclibdir %{_libdir}/ghc-%{ghc_version}
diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index ae1fcba..b3c0654 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.7.1
+Version: 1.0.7.2
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
@@ -90,6 +90,9 @@ EOF
%changelog
+* Fri Oct 25 2013 Jens Petersen <petersen at redhat.com> - 1.0.7.2-1
+- ghcpkgdocdir should be versioned (for F20 and earlier)
+
* Fri Oct 25 2013 Jens Petersen <petersen at redhat.com> - 1.0.7.1-1
- add ghcpkgdocdir, which like _pkgdocdir allows for unversioned haddock dirs
- drop ghc_docdir in favor of _pkgdocdir
More information about the scm-commits
mailing list