From dffe296da10825c612cedc28260421eb1a88592c Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@savoirfairelinux.com>
Date: Thu, 11 Jan 2018 17:09:30 -0500
Subject: [PATCH] docker: Add libcanberra dependency for all supported
platforms.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This dependency was added as a result of adding sound notifications to
the gnome-client.
Change-Id: I6ce113d46709976119afa151c1f2268ab81df545
Reviewed-by: Nicolas Jäger <nicolas.jager@savoirfairelinux.com>
---
docker/Dockerfile_debian_8 | 1 +
docker/Dockerfile_debian_8_i386 | 1 +
docker/Dockerfile_debian_9 | 1 +
docker/Dockerfile_debian_9_i386 | 1 +
docker/Dockerfile_fedora_22 | 1 +
docker/Dockerfile_fedora_22_i386 | 1 +
docker/Dockerfile_fedora_23 | 1 +
docker/Dockerfile_fedora_23_i386 | 1 +
docker/Dockerfile_fedora_24 | 1 +
docker/Dockerfile_fedora_24_i386 | 1 +
docker/Dockerfile_fedora_25 | 1 +
docker/Dockerfile_fedora_25_i386 | 1 +
docker/Dockerfile_fedora_26 | 1 +
docker/Dockerfile_fedora_27 | 1 +
docker/Dockerfile_ubuntu_14.04 | 1 +
docker/Dockerfile_ubuntu_14.04_i386 | 1 +
docker/Dockerfile_ubuntu_15.10 | 1 +
docker/Dockerfile_ubuntu_15.10_i386 | 1 +
docker/Dockerfile_ubuntu_16.04 | 1 +
docker/Dockerfile_ubuntu_16.04_i386 | 1 +
docker/Dockerfile_ubuntu_16.10 | 1 +
docker/Dockerfile_ubuntu_16.10_i386 | 1 +
docker/Dockerfile_ubuntu_17.04 | 1 +
docker/Dockerfile_ubuntu_17.04_i386 | 1 +
docker/Dockerfile_ubuntu_17.10 | 1 +
docker/Dockerfile_ubuntu_17.10_i386 | 1 +
packaging/rules/fedora/ring.spec | 4 +++-
27 files changed, 29 insertions(+), 1 deletion(-)
diff --git a/docker/Dockerfile_debian_8 b/docker/Dockerfile_debian_8
index 73f61bd3..5d63b4b4 100644
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -20,6 +20,7 @@ RUN apt-get update && \
libdbus-c++-dev \
libupnp-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_debian_8_i386 b/docker/Dockerfile_debian_8_i386
index e66deaf8..23ab1571 100644
--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -20,6 +20,7 @@ RUN apt-get update && \
libdbus-c++-dev \
libupnp-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_debian_9 b/docker/Dockerfile_debian_9
index b8e22164..a04f1a88 100644
--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libargon2-0-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_debian_9_i386 b/docker/Dockerfile_debian_9_i386
index 46f1824d..84e9190c 100644
--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libargon2-0-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_fedora_22 b/docker/Dockerfile_fedora_22
index f9a92c6b..8c5948fd 100644
--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_22_i386 b/docker/Dockerfile_fedora_22_i386
index 9e68e157..694e0cca 100644
--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_23 b/docker/Dockerfile_fedora_23
index fdcf3f62..dbdb55d2 100644
--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_23_i386 b/docker/Dockerfile_fedora_23_i386
index 28fd2f7b..b06d139b 100644
--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_24 b/docker/Dockerfile_fedora_24
index 2db293ef..8f0a85ce 100644
--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_24_i386 b/docker/Dockerfile_fedora_24_i386
index bc20d48e..04e1af61 100644
--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_25 b/docker/Dockerfile_fedora_25
index 93540d77..e956e6bf 100644
--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -12,6 +12,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_25_i386 b/docker/Dockerfile_fedora_25_i386
index 0f5aa1b8..582fe139 100644
--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_26 b/docker/Dockerfile_fedora_26
index 22d3c5b3..e8a0535d 100644
--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_26
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_fedora_27 b/docker/Dockerfile_fedora_27
index 5f0ad50a..fd9d5447 100644
--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -15,6 +15,7 @@ RUN dnf upgrade -y && \
cmake \
speexdsp-devel \
pulseaudio-libs-devel \
+ libcanberra-devel \
libsamplerate-devel \
libtool \
dbus-devel \
diff --git a/docker/Dockerfile_ubuntu_14.04 b/docker/Dockerfile_ubuntu_14.04
index 7e7366e1..d307b30f 100644
--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_14.04_i386 b/docker/Dockerfile_ubuntu_14.04_i386
index b1ca9e7b..4e951c13 100644
--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_15.10 b/docker/Dockerfile_ubuntu_15.10
index 6ccecdb1..ed978f6c 100644
--- a/docker/Dockerfile_ubuntu_15.10
+++ b/docker/Dockerfile_ubuntu_15.10
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_15.10_i386 b/docker/Dockerfile_ubuntu_15.10_i386
index 979a3557..3f8d5ec3 100644
--- a/docker/Dockerfile_ubuntu_15.10_i386
+++ b/docker/Dockerfile_ubuntu_15.10_i386
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_16.04 b/docker/Dockerfile_ubuntu_16.04
index c5bb5c41..04f735c9 100644
--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_16.04_i386 b/docker/Dockerfile_ubuntu_16.04_i386
index ee33168a..229326bf 100644
--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -21,6 +21,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_16.10 b/docker/Dockerfile_ubuntu_16.10
index 89e96d50..55b0a6ee 100644
--- a/docker/Dockerfile_ubuntu_16.10
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -31,6 +31,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_16.10_i386 b/docker/Dockerfile_ubuntu_16.10_i386
index 608fc08e..fc05be48 100644
--- a/docker/Dockerfile_ubuntu_16.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -31,6 +31,7 @@ RUN apt-get update && \
libupnp-dev \
libgnutls28-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04 b/docker/Dockerfile_ubuntu_17.04
index 2a02ff3c..f625916a 100644
--- a/docker/Dockerfile_ubuntu_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -32,6 +32,7 @@ RUN apt-get update && \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_17.04_i386 b/docker/Dockerfile_ubuntu_17.04_i386
index d47380d0..1f7be6dd 100644
--- a/docker/Dockerfile_ubuntu_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -32,6 +32,7 @@ RUN apt-get update && \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_17.10 b/docker/Dockerfile_ubuntu_17.10
index 89e3086b..978be9fa 100644
--- a/docker/Dockerfile_ubuntu_17.10
+++ b/docker/Dockerfile_ubuntu_17.10
@@ -32,6 +32,7 @@ RUN apt-get update && \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/docker/Dockerfile_ubuntu_17.10_i386 b/docker/Dockerfile_ubuntu_17.10_i386
index 7ac92f86..e4cb47c4 100644
--- a/docker/Dockerfile_ubuntu_17.10_i386
+++ b/docker/Dockerfile_ubuntu_17.10_i386
@@ -32,6 +32,7 @@ RUN apt-get update && \
libgnutls28-dev \
libargon2-0-dev \
libebook1.2-dev \
+ libcanberra-gtk3-dev \
libclutter-gtk-1.0-dev \
libclutter-1.0-dev \
libglib2.0-dev \
diff --git a/packaging/rules/fedora/ring.spec b/packaging/rules/fedora/ring.spec
index 82376601..6e9c2c13 100644
--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -7,7 +7,7 @@ Version: %{version}
Release: %{release}%{?dist}
Summary: Free software for distributed and secured communication.
Group: Applications/Internet
-License: GPLv3
+License: GPLv3+
URL: https://ring.cx/
Source: ring_%{version}.tar.gz
Requires: ring-daemon = %{version}
@@ -18,6 +18,7 @@ BuildRequires: autoconf
BuildRequires: automake
BuildRequires: cmake
BuildRequires: pulseaudio-libs-devel
+BuildRequires: libcanberra-devel
BuildRequires: libsamplerate-devel
BuildRequires: libtool
BuildRequires: dbus-devel
@@ -196,6 +197,7 @@ DESTDIR=%{buildroot} make -C client-gnome/build install
%{_datadir}/appdata/gnome-ring.appdata.xml
%{_datadir}/libringclient/*
%{_datadir}/locale/*
+%{_datadir}/sounds/gnome-ring/*
%doc %{_mandir}/man1/dring*
%files daemon
--
GitLab