From 41e9ee727e0d6cbc884488be226f00d558316cf6 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 13 Jun 2016 16:16:29 +0900 Subject: [PATCH] %ghc_gen_filelists: uniq keyname to prevent build failure for installed version --- 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 08e729f..180cda7 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.6.1 +Version: 1.6.2 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -124,6 +124,9 @@ EOF %changelog +* Mon Jun 13 2016 Jens Petersen - 1.6.2-1 +- ghc_gen_filelists: uniq keyname to prevent build failure for installed version + * Mon Jun 6 2016 Jens Petersen - 1.6.1-1 - disable debuginfo again until working diff --git a/macros.ghc b/macros.ghc index 8f71099..aa01fe6 100644 --- a/macros.ghc +++ b/macros.ghc @@ -64,7 +64,7 @@ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ %define pkgnamever %{pkgname}-%{pkgver}\ %define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\ %define docdir %{ghclibdocdir}/%{pkgnamever}\ -keyname=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} field %{pkgnamever} key | sed -e "s/key: //")\ +keyname=$(%{_rpmconfigdir}/ghc-pkg-wrapper %{buildroot}%{ghclibdir} field %{pkgnamever} key | sed -e "s/key: //" | uniq)\ pkgdir="%{ghclibdir}/${keyname}"\ rm -f %{basepkg}.files %{basepkg}-devel.files\ touch %{basepkg}.files %{basepkg}-devel.files\