diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26 index 7c28f6d7d61204ef4922ad90f2f4df732ff9b24c..fa4e49e47f8c7c53011346f5f8e9887fe7ad879f 100644 --- a/docker/Dockerfile_fedora_26 +++ b/docker/Dockerfile_fedora_26 @@ -1,7 +1,7 @@ FROM fedora:26 RUN dnf clean all -RUN dnf install -y yum-utils rpmdevtools +RUN dnf install -y dnf-command\(builddep\) rpmdevtools RUN dnf clean all RUN dnf upgrade -y && \ @@ -15,7 +15,7 @@ RUN dnf upgrade -y && \ cmake \ speexdsp-devel \ pulseaudio-libs-devel \ - libcanberra-devel \ + libcanberra-devel \ libsamplerate-devel \ libtool \ dbus-devel \ diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27 index bf6f98152b8f06d39213f6ec3012e3aebac48681..8103a295ddf0eae340c279b05bb8bb7acb6e4203 100644 --- a/docker/Dockerfile_fedora_27 +++ b/docker/Dockerfile_fedora_27 @@ -1,7 +1,7 @@ FROM fedora:27 RUN dnf clean all -RUN dnf install -y yum-utils rpmdevtools +RUN dnf install -y dnf-command\(builddep\) rpmdevtools RUN dnf clean all RUN dnf upgrade -y && \ @@ -15,7 +15,7 @@ RUN dnf upgrade -y && \ cmake \ speexdsp-devel \ pulseaudio-libs-devel \ - libcanberra-devel \ + libcanberra-devel \ libsamplerate-devel \ libtool \ dbus-devel \ diff --git a/docker/Dockerfile_fedora_28 b/docker/Dockerfile_fedora_28 index 66bebe5037304f928b01ba4d60f1c113d8549148..f1b577234675cae851eb3ff9f0a423bd7bf3699e 100644 --- a/docker/Dockerfile_fedora_28 +++ b/docker/Dockerfile_fedora_28 @@ -1,7 +1,7 @@ FROM fedora:28 RUN dnf clean all -RUN dnf install -y yum-utils rpmdevtools +RUN dnf install -y dnf-command\(builddep\) rpmdevtools RUN dnf clean all RUN dnf upgrade -y && \ diff --git a/scripts/build-package-fedora.sh b/scripts/build-package-fedora.sh index 3f1889a456c0a9ba77983dd683c73d7c89635820..af05696c3644b126fbc7834cdccca9377601f201 100755 --- a/scripts/build-package-fedora.sh +++ b/scripts/build-package-fedora.sh @@ -33,7 +33,7 @@ sed -i "s/RELEASE_VERSION/${RELEASE_VERSION}/g" ring.spec rpmdev-bumpspec --comment="Automatic nightly release" --userstring="Jenkins <ring@lists.savoirfairelinux.net>" ring.spec # install build deps -yum-builddep -y ring.spec || echo "ignoring yum-builddep failure" +dnf builddep -y ring.spec || echo "ignoring dnf builddep failure" # place the source mkdir -p /root/rpmbuild/SOURCES