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
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>
feea7bbb · Lubomir Rintel · Guillaume Roguez · be0bb8e1 · feea7bbb · feea7bbb
Commit feea7bbb authored Dec 19, 2017 by Lubomir Rintel Committed by Guillaume Roguez Dec 19, 2017
29 changed files
--- 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 \

--- a/docker/Dockerfile_ubuntu_16.10
+++ b/docker/Dockerfile_ubuntu_16.10
@@ -67,7 +67,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.10_i386
+++ b/docker/Dockerfile_ubuntu_16.10_i386
@@ -67,7 +67,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_17.04
+++ b/docker/Dockerfile_ubuntu_17.04
@@ -69,7 +69,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_17.04_i386
+++ b/docker/Dockerfile_ubuntu_17.04_i386
@@ -69,7 +69,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_17.10
+++ b/docker/Dockerfile_ubuntu_17.10
@@ -69,7 +69,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_17.10_i386
+++ b/docker/Dockerfile_ubuntu_17.10_i386
@@ -69,7 +69,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/make-ring.py
+++ b/make-ring.py
@@ -109,7 +109,7 @@ FEDORA_DEPENDENCIES = [
    'yaml-cpp-devel', 'qt5-qtbase-devel', 'swig', 'qrencode-devel', 'jsoncpp-devel',
    'gtk3-devel', 'clutter-devel', 'clutter-gtk-devel', 'evolution-data-server-devel',
    'libnotify-devel', 'libappindicator-gtk3-devel', 'patch', 'libva-devel',
-    'webkitgtk4-devel', 'NetworkManager-glib-devel', 'libvdpau-devel', 'msgpack-devel'
+    'webkitgtk4-devel', 'NetworkManager-libnm-devel', 'libvdpau-devel', 'msgpack-devel'
 ]

 UBUNTU_DEPENDENCIES = [
@@ -123,7 +123,7 @@ UBUNTU_DEPENDENCIES = [
    'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
    'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
    'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
-    'libva-dev', 'libnm-glib-dev',
+    'libva-dev', 'libnm-dev',
    'libwebkit2gtk-4.0-dev', 'libvdpau-dev', 'libmsgpack-dev'
 ]

@@ -138,7 +138,7 @@ DEBIAN_DEPENDENCIES = [
    'libsndfile1-dev', 'libspeex-dev', 'libspeexdsp-dev', 'libswscale-dev', 'libtool',
    'libudev-dev', 'libupnp-dev', 'libyaml-cpp-dev', 'qtbase5-dev', 'sip-tester', 'swig',
    'uuid-dev', 'yasm', 'libqrencode-dev', 'libjsoncpp-dev', 'libappindicator3-dev',
-    'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-glib-dev', 'libvdpau-dev', 'libmsgpack-dev'
+    'libva-dev', 'libwebkit2gtk-4.0-dev', 'libnm-dev', 'libvdpau-dev', 'libmsgpack-dev'
 ]

 ARCH_LINUX_DEPENDENCIES = [
@@ -147,7 +147,7 @@ ARCH_LINUX_DEPENDENCIES = [
    'expat', 'gsm', 'gtk3', 'jack', 'libnotify', 'opus', 'pcre', 'libpulse', 'libsamplerate',
    'libsndfile', 'speex', 'speexdsp', 'libtool', 'libupnp', 'yaml-cpp', 'qt5-base',
    'swig', 'yasm', 'qrencode', 'evolution-data-server', 'make', 'patch', 'pkg-config',
-    'automake', 'libva', 'webkit2gtk', 'libnm-glib', 'libvdpau'
+    'automake', 'libva', 'webkit2gtk', 'libnm', 'libvdpau'
 ]

 OSX_DEPENDENCIES = [

--- a/packaging/rules/debian/control
+++ b/packaging/rules/debian/control
@@ -21,7 +21,7 @@ Build-Depends: debhelper (>= 9),
               gettext,
               libqrencode-dev,
               libappindicator3-dev,
-               libnm-glib-dev,
+               libnm-dev,
               libwebkit2gtk-4.0-dev | libwebkit2gtk-3.0-dev,
 # ring-daemon
               libdbus-1-dev,

--- a/packaging/rules/fedora/ring.spec
+++ b/packaging/rules/fedora/ring.spec
@@ -62,7 +62,7 @@ BuildRequires: libnotify-devel
 BuildRequires: qt5-qttools-devel
 BuildRequires: qrencode-devel
 BuildRequires: libappindicator-gtk3-devel
-BuildRequires: NetworkManager-glib-devel
+BuildRequires: NetworkManager-libnm-devel
 BuildRequires: libva-devel
 BuildRequires: webkitgtk4-devel
 BuildRequires: cryptopp-devel