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

fix the package.conf existence check

This commit is contained in:
Jens Petersen 2017-09-13 19:17:01 +09:00
parent 430e328400
commit b78d93fec3
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ghc-rpm-macros.spec
View File

@ -10,7 +10,7 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
Version: 1.7.0
Version: 1.6.50
Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC
@ -162,8 +162,10 @@ EOF
%changelog
* Wed Sep 13 2017 Jens Petersen <petersen@redhat.com> - 1.7.0-1
* Wed Sep 13 2017 Jens Petersen <petersen@redhat.com> - 1.6.50-1
- make some macro call args explicit for rpm-4.14 scope change
(this breaks builds with earlier versions of rpm)
- fix the package.conf existence check
* Wed Aug 2 2017 Jens Petersen <petersen@redhat.com>
- ghc_gen_filelists: check package.conf exists

4
macros.ghc
View File

@ -73,8 +73,8 @@ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\
%define pkgnamever %{pkgname}-%{pkgver}\
%define basepkg %{?ghc_name}%{!?ghc_name:ghc}-%{pkgname}\
%define docdir %{ghclibdocdir}/%{pkgnamever}\
if [ ! -f "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf" ]; then\
echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf not found"\
if [ ! -f %{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf ]; then\
echo "%{buildroot}%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf not found"\
exit 1\
fi\
pkgconf=$(echo "%{ghclibdir}/package.conf.d/%{pkgnamever}*.conf")\