Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Fix build.sh to work on Amazon Linux.

On Amazon Linux, `buildsys-macros` providing `/etc/rpm/macros.dist` does
not exist. Rather, `system-release` provides `/etc/rpm/macros.disttag`.
Apart from failing the check for `/etc/rpm/macros.dist` in build.sh, the
RPM builds fine. This patch changes build.sh to look for either file.
  • Loading branch information...
commit f5d78867dd95defac9f9a5d74eba0c46808c7db4 1 parent aedff83
JD Harrington psi authored

Showing 1 changed file with 2 additions and 1 deletion. Show diff stats Hide diff stats

  1. +2 1  build.sh
3  build.sh
@@ -2,7 +2,8 @@
2 2
3 3 whereami=$(dirname $0)
4 4
5   -if [ ! -f "/etc/rpm/macros.dist" ]; then echo "please install 'buildsys-macros' rpm and try again" ; exit 1 ; fi
  5 +if [ ! -f "/etc/rpm/macros.dist" ] && \
  6 + [ ! -f "/etc/rpm/macros.disttag" ]; then echo "please install 'buildsys-macros' rpm and try again" ; exit 1 ; fi
6 7 if [ ! -f "$(which rpmbuild)" ]; then echo "please install 'rpm-build' rpm and try again" ; exit 1 ; fi
7 8 if [ ! -f "$(which spectool)" ]; then echo "please install 'rpmdevtools' rpm and try again" ; exit 1 ; fi
8 9 if [ ! -f "$(which rpmdev-setuptree)" ]; then echo "please install 'rpmdevtools' rpm and try again" ; exit 1 ; fi

0 comments on commit f5d7886

Please sign in to comment.
Something went wrong with that request. Please try again.