[cpphs] use new ghc_docdir to handle F20 unversioned docdir

Jens Petersen petersen at fedoraproject.org
Fri Jul 26 05:43:43 UTC 2013


commit 9ad13e053ba5c9acc9c9af22f8637c884f1d81a7
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jul 26 14:43:27 2013 +0900

    use new ghc_docdir to handle F20 unversioned docdir

 cpphs.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/cpphs.spec b/cpphs.spec
index 27504bc..42ee916 100644
--- a/cpphs.spec
+++ b/cpphs.spec
@@ -4,7 +4,7 @@
 
 Name:           %{pkg_name}
 Version:        1.16
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A liberalised C pre-processor for Haskell
 
 License:        GPL+ and LGPLv2+
@@ -61,7 +61,7 @@ This package provides the Haskell %{name} library development files.
 
 %install
 %ghc_lib_install
-rm %{buildroot}%{_docdir}/%{name}-%{version}/LICENCE-LGPL
+rm %{buildroot}%{ghc_docdir}/LICENCE-LGPL
 
 install -D -p -m 0644 docs/cpphs.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
@@ -88,8 +88,11 @@ install -D -p -m 0644 docs/cpphs.1 %{buildroot}%{_mandir}/man1/%{name}.1
 
 
 %changelog
+* Fri Jul 26 2013 Jens Petersen <petersen at redhat.com> - 1.16-4
+- use ghc_docdir to handle F20 unversioned docdir
+
 * Tue Jun 11 2013 Jens Petersen <petersen at redhat.com>
-- update to new simplified Haskell Packaging Guidelines
+- update to new approved simplified Haskell Packaging Guidelines
 
 * Wed Apr 24 2013 Jens Petersen <petersen at redhat.com> - 1.16-2
 - update to revised simplified Haskell Packaging Guidelines (cabal-rpm-0.8)


More information about the scm-commits mailing list