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

Define pkgdir as %{ghclibdir}/%{pkgnamever} instead of %{ghclibdir}/${key}

Browse Source
This commit is contained in:
Robert-André Mauchin 2018-04-07 12:49:24 +02:00
parent 4887078b34
commit 3c4760fac8
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -11,7 +11,7 @@
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.8.7 Version: 1.8.7
Release: 4%{?dist} Release: 5%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ License: GPLv3+
@ -165,6 +165,9 @@ EOF
%changelog %changelog
* Sat Apr 7 2018 Robert-Andr« Mauchin <zebob.m@gmail.com> - 1.8.7-5
- Define pkgdir as %%{ghclibdir}/%%{pkgnamever} instead of %%{ghclibdir}/${key}
* Thu Apr 5 2018 Jens Petersen <petersen@redhat.com> - 1.8.7-4 * Thu Apr 5 2018 Jens Petersen <petersen@redhat.com> - 1.8.7-4
- configure libexecsubdir (Cabal-2 only) (#1563863) - configure libexecsubdir (Cabal-2 only) (#1563863)
- change drop hash from libsubdir - change drop hash from libsubdir

3
macros.ghc
View File

@ -85,8 +85,7 @@ echo "%{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf not found"\
exit 1\ exit 1\
fi\ fi\
pkgconf=$(echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf")\ pkgconf=$(echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf")\
key=$(grep "key: " %{buildroot}${pkgconf} | sed -e "s/key: //")\ pkgdir="%{ghclibdir}/%{pkgnamever}"\
pkgdir="%{ghclibdir}/${key}"\
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\
echo ${pkgconf} >> %{basepkg}-devel.files\ echo ${pkgconf} >> %{basepkg}-devel.files\