packaging: use libnm instead of libnm-glib

libnm-glib has been deprecated for three years and is eventually going to disappear. [GR: update Debian/Ubuntu deps as well and all docker files] Change-Id: I60a9b1a37098715ac55d5fee6718883d2a55fe3c Reviewed-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com> Signed-off-by: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>

packaging: use libnm instead of libnm-glib
feea7bbb · Lubomir Rintel · Guillaume Roguez · be0bb8e1 · feea7bbb · feea7bbb
Commit feea7bbb authored 7 years ago by Lubomir Rintel Committed by Guillaume Roguez 7 years ago
--- a/docker/Dockerfile_debian_8
+++ b/docker/Dockerfile_debian_8
@@ -56,7 +56,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_debian_8_i386
+++ b/docker/Dockerfile_debian_8_i386
@@ -56,7 +56,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_debian_9
+++ b/docker/Dockerfile_debian_9
@@ -58,7 +58,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_debian_9_i386
+++ b/docker/Dockerfile_debian_9_i386
@@ -58,7 +58,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_fedora_22
+++ b/docker/Dockerfile_fedora_22
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
        webkitgtk4-devel \
        cryptopp-devel \
        libva-devel \
-        libvdpau-devel
+        libvdpau-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_22_i386
+++ b/docker/Dockerfile_fedora_22_i386
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
        webkitgtk4-devel \
        cryptopp-devel \
        libva-devel \
-        libvdpau-devel
+        libvdpau-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_23
+++ b/docker/Dockerfile_fedora_23
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
        webkitgtk4-devel \
        cryptopp-devel \
        libva-devel \
-        libvdpau-devel
+        libvdpau-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_23_i386
+++ b/docker/Dockerfile_fedora_23_i386
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
        webkitgtk4-devel \
        cryptopp-devel \
        libva-devel \
-        libvdpau-devel
+        libvdpau-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_24
+++ b/docker/Dockerfile_fedora_24
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
        webkitgtk4-devel \
        cryptopp-devel \
        libva-devel \
-        libvdpau-devel
+        libvdpau-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_24_i386
+++ b/docker/Dockerfile_fedora_24_i386
@@ -51,7 +51,8 @@ RUN dnf upgrade -y && \
        webkitgtk4-devel \
        cryptopp-devel \
        libva-devel \
-        libvdpau-devel
+        libvdpau-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_25
+++ b/docker/Dockerfile_fedora_25
@@ -49,7 +49,8 @@ RUN dnf upgrade -y && \
        cryptopp-devel \
        libva-devel \
        libvdpau-devel \
-        msgpack-devel
+        msgpack-devel \
+        NetworkManager-libnm-devel

 # Packaging tools
 RUN dnf install -y yum-utils rpmdevtools

--- a/docker/Dockerfile_fedora_25_i386
+++ b/docker/Dockerfile_fedora_25_i386
@@ -52,7 +52,8 @@ RUN dnf upgrade -y && \
        cryptopp-devel \
        libva-devel \
        libvdpau-devel \
-        msgpack-devel
+        msgpack-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_26
+++ b/docker/Dockerfile_fedora_26
@@ -52,7 +52,8 @@ RUN dnf upgrade -y && \
        cryptopp-devel \
        libva-devel \
        libvdpau-devel \
-        msgpack-devel
+        msgpack-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_fedora_27
+++ b/docker/Dockerfile_fedora_27
@@ -52,7 +52,8 @@ RUN dnf upgrade -y && \
        cryptopp-devel \
        libva-devel \
        libvdpau-devel \
-        msgpack-devel
+        msgpack-devel \
+        NetworkManager-libnm-devel

 ADD scripts/build-package-fedora.sh /opt/build-package-fedora.sh


--- a/docker/Dockerfile_ubuntu_14.04
+++ b/docker/Dockerfile_ubuntu_14.04
@@ -57,7 +57,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-3.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_ubuntu_14.04_i386
+++ b/docker/Dockerfile_ubuntu_14.04_i386
@@ -57,7 +57,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-3.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_ubuntu_15.10
+++ b/docker/Dockerfile_ubuntu_15.10
@@ -57,7 +57,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_ubuntu_15.10_i386
+++ b/docker/Dockerfile_ubuntu_15.10_i386
@@ -57,7 +57,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_ubuntu_16.04
+++ b/docker/Dockerfile_ubuntu_16.04
@@ -57,7 +57,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \

--- a/docker/Dockerfile_ubuntu_16.04_i386
+++ b/docker/Dockerfile_ubuntu_16.04_i386
@@ -57,7 +57,7 @@ RUN apt-get update && \
        libnatpmp-dev \
        libappindicator3-dev \
        libqrencode-dev \
-        libnm-glib-dev \
+        libnm-dev \
        libwebkit2gtk-4.0-dev \
        libcrypto++-dev \
        libva-dev \