docker: Add libcanberra dependency for all supported platforms.

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: Add libcanberra dependency for all supported platforms.
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>
dffe296d · Maxim Cournoyer · Nicolas Jager · 494d2135 · dffe296d · dffe296d
Commit dffe296d authored Jan 11, 2018 by Maxim Cournoyer Committed by Nicolas Jager Jan 12, 2018
27 changed files
--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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 \

--- 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