From bd0af716de38627f9ad2ce17ef59fb17f1ba177f Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Tue, 23 Jan 2018 15:24:11 +0100
Subject: [PATCH] %ghc_fix_rpath: remove leading or trailing ':'

---
 ghc-rpm-macros.spec | 5 ++++-
 macros.ghc          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index a6bb427..239ec3c 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -10,7 +10,7 @@
 #%%global without_hscolour 1
 
 Name:           ghc-rpm-macros
-Version:        1.8.0
+Version:        1.8.1
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -162,6 +162,9 @@ EOF
 
 
 %changelog
+* Tue Jan 23 2018 Jens Petersen <petersen@redhat.com> - 1.8.1-1
+- ghc_fix_rpath: remove leading or trailing ':'
+
 * Mon Jan 22 2018 Jens Petersen <petersen@redhat.com> - 1.8.0-1
 - add _ghcdynlibdir for Cabal --dynlibdir
 - dynlibs in _libdir
diff --git a/macros.ghc b/macros.ghc
index e00139a..625277e 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -194,7 +194,7 @@ for lib in %*; do\
               *)\
                 syspath="" ;;\
          esac\
-         newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g" -e "s/::/:/")\
+         newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g" -e "s/::/:/" -e "s/^://" -e "s/:$//")\
          chrpath -r $newrpath $i\
          ;;\
     esac\