[haskell-platform] tweaks paths for F20 unversioned docdir

Jens Petersen petersen at fedoraproject.org
Fri Jul 26 04:07:04 UTC 2013


commit 10870b0f2d613fe4145fe4ca8a6d7c9f5c209456
Author: Jens Petersen <petersen at redhat.com>
Date:   Fri Jul 26 13:06:45 2013 +0900

    tweaks paths for F20 unversioned docdir

 haskell-platform.spec |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/haskell-platform.spec b/haskell-platform.spec
index e01786a..6766c60 100644
--- a/haskell-platform.spec
+++ b/haskell-platform.spec
@@ -284,12 +284,12 @@ cd ..
 
 %ghc_strip_dynlinked
 
+# need versioned docdir's here for F19!
 # haskell-platform
-if [ -d %{buildroot}%{_docdir}/ghc-haskell-platform-%{version} ]; then
-  mv %{buildroot}%{_docdir}/ghc-haskell-platform{,-devel}-%{version}
+if [ -d %{buildroot}%{_docdir}/ghc-haskell-platform ]; then
+  mv %{buildroot}%{_docdir}/ghc-haskell-platform{,-devel}
 fi
-
-mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit-*/
+mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit/
 
 
 %post -n ghc-haskell-platform-devel
@@ -339,8 +339,9 @@ mv %{buildroot}%{_datadir}/HUnit-*/* %{buildroot}%{_docdir}/ghc-HUnit-*/
 
 
 %changelog
-* Thu Jul 25 2013 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-24
+* Fri Jul 26 2013 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-24
 - fix packaging of license files when building without shared libraries
+- tweaks for F20 unversioned docdir
 
 * Sat May  4 2013 Jens Petersen <petersen at redhat.com> - 2013.2.0.0-23
 - update to 2013.2.0.0


More information about the scm-commits mailing list