diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-02-25 20:04:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-25 20:04:16 +0100 |
commit | d3aa64c77c501b630ae2e0a227e10c38e14b1f4f (patch) | |
tree | 27e19cb4acc3ccd6f1119629b5018be83e02103a | |
parent | 3d37dc639d87e4469a6457cf4592ff5b773d0777 (diff) | |
parent | 9f6fc7011025986c893b633ef09e146105ffecc1 (diff) | |
download | podman-d3aa64c77c501b630ae2e0a227e10c38e14b1f4f.tar.gz podman-d3aa64c77c501b630ae2e0a227e10c38e14b1f4f.tar.bz2 podman-d3aa64c77c501b630ae2e0a227e10c38e14b1f4f.zip |
Merge pull request #5312 from raukadah/fixfedora30
Fixed build_rpm.sh script for Fedora 30
-rwxr-xr-x | contrib/build_rpm.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/contrib/build_rpm.sh b/contrib/build_rpm.sh index e6acbdb15..de6941199 100755 --- a/contrib/build_rpm.sh +++ b/contrib/build_rpm.sh @@ -46,8 +46,13 @@ if [[ $pkg_manager == *dnf ]]; then ) fi +# Package name on fedora 30 is golang-github-cpuguy83-go-md2man +if (grep -i 'Fedora' /etc/redhat-release | grep " 30" ) ; then + PKGS+=(golang-github-cpuguy83-go-md2man \ + btrfs-progs-devel \ + ) # btrfs-progs-devel is not available in CentOS/RHEL-8 -if ! (grep -i 'Red Hat\|CentOS' /etc/redhat-release | grep " 8" ); then +elif ! (grep -i 'Red Hat\|CentOS' /etc/redhat-release | grep " 8" ) ; then PKGS+=(golang-github-cpuguy83-md2man \ btrfs-progs-devel \ ) |