From 7f2521ed88a4a639c513d275bcda2e86dda4e3e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Wed, 6 Jul 2016 18:36:20 -0400
Subject: [PATCH] packaging: add libnatpmp
Add libnatpmp to docker images
Change-Id: I63b742623fbd894f375da75b55a130b7712053db
Tuleap: #805
---
debian/control | 2 +-
docker/debian_8/Dockerfile | 2 +-
docker/debian_8_i386/Dockerfile | 2 +-
docker/debian_9/Dockerfile | 2 +-
docker/debian_9_i386/Dockerfile | 2 +-
docker/fedora_22/Dockerfile | 3 ++-
docker/fedora_22_i386/Dockerfile | 3 ++-
docker/fedora_23/Dockerfile | 3 ++-
docker/fedora_23_i386/Dockerfile | 3 ++-
docker/fedora_24/Dockerfile | 3 ++-
docker/fedora_24_i386/Dockerfile | 3 ++-
docker/ubuntu_14.04/Dockerfile | 2 +-
docker/ubuntu_14.04_i386/Dockerfile | 2 +-
docker/ubuntu_15.10/Dockerfile | 2 +-
docker/ubuntu_15.10_i386/Dockerfile | 2 +-
docker/ubuntu_16.04/Dockerfile | 2 +-
docker/ubuntu_16.04_i386/Dockerfile | 2 +-
ring-daemon.spec | 2 +-
18 files changed, 24 insertions(+), 18 deletions(-)
diff --git a/debian/control b/debian/control
index d4f63dd558..0fa041324f 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 9),
libdbus-c++-dev, libsndfile1-dev, libxext-dev,
libxfixes-dev, yasm, autopoint, unbound-anchor, git-core, libspeex-dev,
libspeexdsp-dev, autotools-dev, chrpath, check, astyle,
- uuid-dev, libudev-dev, libjsoncpp-dev, cmake
+ uuid-dev, libudev-dev, libjsoncpp-dev, libnatpmp-dev, cmake
Package: ring-daemon
Architecture: any
diff --git a/docker/debian_8/Dockerfile b/docker/debian_8/Dockerfile
index 41f534f259..1c1255e3e0 100644
--- a/docker/debian_8/Dockerfile
+++ b/docker/debian_8/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgr
RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libnatpmp-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
libspeexdsp-dev autotools-dev chrpath check astyle \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/debian_8_i386/Dockerfile b/docker/debian_8_i386/Dockerfile
index 996185755e..03a3cf97de 100644
--- a/docker/debian_8_i386/Dockerfile
+++ b/docker/debian_8_i386/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgr
RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libnatpmp-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
libspeexdsp-dev autotools-dev chrpath check astyle \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/debian_9/Dockerfile b/docker/debian_9/Dockerfile
index c5406699b9..33998f9a86 100644
--- a/docker/debian_9/Dockerfile
+++ b/docker/debian_9/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgr
RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libnatpmp-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
libspeexdsp-dev autotools-dev chrpath check astyle \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/debian_9_i386/Dockerfile b/docker/debian_9_i386/Dockerfile
index ede3946dad..c4dc6f54ef 100644
--- a/docker/debian_9_i386/Dockerfile
+++ b/docker/debian_9_i386/Dockerfile
@@ -4,7 +4,7 @@ RUN apt-get update && ( apt-get upgrade -y || apt-get upgrade -y || apt-get upgr
RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
rsync git autoconf automake libpulse-dev libsamplerate0-dev libtool \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
- libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
+ libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libnatpmp-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
libspeexdsp-dev autotools-dev chrpath check astyle \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/fedora_22/Dockerfile b/docker/fedora_22/Dockerfile
index 9f58efa080..0c4dc7122e 100644
--- a/docker/fedora_22/Dockerfile
+++ b/docker/fedora_22/Dockerfile
@@ -7,4 +7,5 @@ RUN yum install rpm-build tar rsync git make autoconf automake cmake \
dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
- uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y
+ uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel \
+ libnatpmp-devel -y
diff --git a/docker/fedora_22_i386/Dockerfile b/docker/fedora_22_i386/Dockerfile
index 0201e15951..7eaa5384d4 100644
--- a/docker/fedora_22_i386/Dockerfile
+++ b/docker/fedora_22_i386/Dockerfile
@@ -7,4 +7,5 @@ RUN yum install rpm-build tar rsync git make autoconf automake cmake \
dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
- uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y
+ uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel \
+ libnatpmp-devel -y
diff --git a/docker/fedora_23/Dockerfile b/docker/fedora_23/Dockerfile
index a42cddb38b..e6a445f629 100644
--- a/docker/fedora_23/Dockerfile
+++ b/docker/fedora_23/Dockerfile
@@ -7,4 +7,5 @@ RUN dnf install rpm-build tar rsync git make autoconf automake cmake \
dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
- uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y
+ uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel \
+ libnatpmp-devel -y
diff --git a/docker/fedora_23_i386/Dockerfile b/docker/fedora_23_i386/Dockerfile
index 4c294b3358..b3eb5a2b7a 100644
--- a/docker/fedora_23_i386/Dockerfile
+++ b/docker/fedora_23_i386/Dockerfile
@@ -7,4 +7,5 @@ RUN dnf install rpm-build tar rsync git make autoconf automake cmake \
dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
- uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y
+ uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel \
+ libnatpmp-devel -y
diff --git a/docker/fedora_24/Dockerfile b/docker/fedora_24/Dockerfile
index 6c8d5ff980..27474cc1ba 100644
--- a/docker/fedora_24/Dockerfile
+++ b/docker/fedora_24/Dockerfile
@@ -7,4 +7,5 @@ RUN dnf install rpm-build tar rsync git make autoconf automake cmake \
dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
- uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y
+ uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel \
+ libnatpmp-devel -y
diff --git a/docker/fedora_24_i386/Dockerfile b/docker/fedora_24_i386/Dockerfile
index 67e3f3e224..91475187ad 100644
--- a/docker/fedora_24_i386/Dockerfile
+++ b/docker/fedora_24_i386/Dockerfile
@@ -7,4 +7,5 @@ RUN dnf install rpm-build tar rsync git make autoconf automake cmake \
dbus-c++-devel dbus-devel libsndfile-devel libXext-devel libXfixes-devel \
yasm git speex-devel chrpath check astyle uuid-c++-devel libupnp-devel \
gettext-devel gcc-c++ which alsa-lib-devel systemd-devel libuuid-devel \
- uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel -y
+ uuid-devel gnutls-devel nettle-devel opus-devel patch jsoncpp-devel \
+ libnatpmp-devel -y
diff --git a/docker/ubuntu_14.04/Dockerfile b/docker/ubuntu_14.04/Dockerfile
index d0c1441f73..00b23c0b16 100644
--- a/docker/ubuntu_14.04/Dockerfile
+++ b/docker/ubuntu_14.04/Dockerfile
@@ -6,5 +6,5 @@ RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev libnatpmp-dev \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/ubuntu_14.04_i386/Dockerfile b/docker/ubuntu_14.04_i386/Dockerfile
index 4418484dbd..52a47f1280 100644
--- a/docker/ubuntu_14.04_i386/Dockerfile
+++ b/docker/ubuntu_14.04_i386/Dockerfile
@@ -6,5 +6,5 @@ RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev libnatpmp-dev \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/ubuntu_15.10/Dockerfile b/docker/ubuntu_15.10/Dockerfile
index da9518e15c..f41cb7fa03 100644
--- a/docker/ubuntu_15.10/Dockerfile
+++ b/docker/ubuntu_15.10/Dockerfile
@@ -6,5 +6,5 @@ RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev libnatpmp-dev \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/ubuntu_15.10_i386/Dockerfile b/docker/ubuntu_15.10_i386/Dockerfile
index 279ca73ef4..aba5ad573f 100644
--- a/docker/ubuntu_15.10_i386/Dockerfile
+++ b/docker/ubuntu_15.10_i386/Dockerfile
@@ -6,5 +6,5 @@ RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
libdbus-1-dev libasound2-dev libexpat1-dev libpcre3-dev libyaml-cpp-dev \
libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
- libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev \
+ libspeexdsp-dev autotools-dev chrpath check astyle libupnp-dev libnatpmp-dev \
uuid-dev libudev-dev cmake libjsoncpp-dev --fix-missing
diff --git a/docker/ubuntu_16.04/Dockerfile b/docker/ubuntu_16.04/Dockerfile
index 083d055c3d..86de01673a 100644
--- a/docker/ubuntu_16.04/Dockerfile
+++ b/docker/ubuntu_16.04/Dockerfile
@@ -7,5 +7,5 @@ RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libgnutls-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake libjsoncpp-dev \
+ uuid-dev libudev-dev cmake libjsoncpp-dev libnatpmp-dev \
libavcodec-dev libavcodec-extra libavdevice-dev libavformat-dev --fix-missing
diff --git a/docker/ubuntu_16.04_i386/Dockerfile b/docker/ubuntu_16.04_i386/Dockerfile
index 030b8ce7e5..06b8f230eb 100644
--- a/docker/ubuntu_16.04_i386/Dockerfile
+++ b/docker/ubuntu_16.04_i386/Dockerfile
@@ -7,5 +7,5 @@ RUN apt-get install -y devscripts debianutils debhelper build-essential tar \
libboost-dev libdbus-c++-dev libsndfile1-dev libxext-dev libgnutls-dev \
libxfixes-dev yasm autopoint unbound-anchor git-core libspeex-dev \
libspeexdsp-dev autotools-dev chrpath check astyle \
- uuid-dev libudev-dev cmake libjsoncpp-dev \
+ uuid-dev libudev-dev cmake libjsoncpp-dev libnatpmp-dev \
libavcodec-dev libavcodec-extra libavdevice-dev libavformat-dev --fix-missing
diff --git a/ring-daemon.spec b/ring-daemon.spec
index 2ed98ebfc8..11f8466d4f 100644
--- a/ring-daemon.spec
+++ b/ring-daemon.spec
@@ -18,7 +18,7 @@ BuildRequires: dbus-devel libsndfile-devel libXext-devel libXfixes-devel
BuildRequires: yasm git speex-devel chrpath check astyle uuid-c++-devel
BuildRequires: gettext-devel gcc-c++ which alsa-lib-devel systemd-devel
BuildRequires: libuuid-devel uuid-devel gnutls-devel nettle-devel
-BuildRequires: opus-devel jsoncpp-devel
+BuildRequires: opus-devel jsoncpp-devel libnatpmp-devel
%description
Ring is free software for distributed and secured communication.
--
GitLab