rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

%ghc_gen_filelists: uniq keyname to prevent build failure for installed version

Browse Source
This commit is contained in:
Jens Petersen 2016-06-13 16:16:29 +09:00
parent d364972a87
commit 41e9ee727e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -10,7 +10,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.6.1 Version: 1.6.2
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
@ -124,6 +124,9 @@ EOF
%changelog %changelog
* Mon Jun 13 2016 Jens Petersen <petersen@redhat.com> - 1.6.2-1
- ghc_gen_filelists: uniq keyname to prevent build failure for installed version
* Mon Jun 6 2016 Jens Petersen <petersen@redhat.com> - 1.6.1-1 * Mon Jun 6 2016 Jens Petersen <petersen@redhat.com> - 1.6.1-1
- disable debuginfo again until working - disable debuginfo again until working

2
macros.ghc
View File

@ -64,7 +64,7 @@ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\
%define pkgnamever %{pkgname}-%{pkgver}\ %define pkgnamever %{pkgname}-%{pkgver}\
%define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\ %define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\
%define docdir %{ghclibdocdir}/%{pkgnamever}\ %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}"\ pkgdir="%{ghclibdir}/${keyname}"\
rm -f %{basepkg}.files %{basepkg}-devel.files\ rm -f %{basepkg}.files %{basepkg}-devel.files\
touch %{basepkg}.files %{basepkg}-devel.files\ touch %{basepkg}.files %{basepkg}-devel.files\