Skip to content

Commit

Permalink
Fix various centos vs fedora issues in reworked gitlab-build-rpm.sh
Browse files Browse the repository at this point in the history
 * use dnf instead of yum for fedora to avoid yum-builddep bug
 * make sure we install 'which' on centos since our bootstrap
   script needs it
  • Loading branch information
salcock committed Feb 22, 2019
1 parent 256d3e2 commit 0c527ee
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions gitlab-build-rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,15 @@ if [ "$1" = "centos6" ]; then
yum install -y epel-rpm-macros
fi

yum install -y rpm-build yum-utils rpmdevtools
yum groupinstall -y 'Development Tools'
yum-builddep -y rpm/libwandio1.spec
if [[ "$1" =~ fedora* ]]; then
dnf install -y rpm-build rpmdevtools
dnf group install -y "C Development Tools and Libraries"
dnf builddep -y rpm/libwandio1.spec
else
yum install -y rpm-build yum-utils rpmdevtools which
yum groupinstall -y 'Development Tools'
yum-builddep -y rpm/libwandio1.spec
fi

rpmdev-setuptree

Expand Down

0 comments on commit 0c527ee

Please sign in to comment.