From 5f3e928a89b6c6a4aa348f7c8cd5585f5b36ad6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Thu, 7 Jun 2018 13:58:42 -0400
Subject: [PATCH] fedora: use dnf builddep instead yum-builddep
Change-Id: Iab011abd51859cdcfb30663fb8bd2fd44aa71bcd
---
docker/Dockerfile_fedora_26 | 4 ++--
docker/Dockerfile_fedora_27 | 4 ++--
docker/Dockerfile_fedora_28 | 2 +-
scripts/build-package-fedora.sh | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26
index 7c28f6d7..fa4e49e4 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 bf6f9815..8103a295 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 66bebe50..f1b57723 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 3f1889a4..af05696c 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
--
GitLab