diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index fbffa6f..99dbec0 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@ Name: ghc-rpm-macros Version: 1.8.7 -Release: 4%{?dist} +Release: 5%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -165,6 +165,9 @@ EOF %changelog +* Sat Apr 7 2018 Robert-AndrĀ« Mauchin - 1.8.7-5 +- Define pkgdir as %%{ghclibdir}/%%{pkgnamever} instead of %%{ghclibdir}/${key} + * Thu Apr 5 2018 Jens Petersen - 1.8.7-4 - configure libexecsubdir (Cabal-2 only) (#1563863) - change drop hash from libsubdir diff --git a/macros.ghc b/macros.ghc index 13ff6ff..496c927 100644 --- a/macros.ghc +++ b/macros.ghc @@ -85,8 +85,7 @@ echo "%{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf not found"\ exit 1\ fi\ pkgconf=$(echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf")\ -key=$(grep "key: " %{buildroot}${pkgconf} | sed -e "s/key: //")\ -pkgdir="%{ghclibdir}/${key}"\ +pkgdir="%{ghclibdir}/%{pkgnamever}"\ rm -f %{basepkg}.files %{basepkg}-devel.files\ touch %{basepkg}.files %{basepkg}-devel.files\ echo ${pkgconf} >> %{basepkg}-devel.files\