all: goodbye libnm-glib

This removes libnm-glib, libnm-glib-vpn, and libnm-util for good.
The it has been replaced with libnm since NetworkManager 1.0, disabled
by default since 1.12 and no up-to-date distributions ship it for years
now.

Removing the libraries allows us to:

* Remove the horrible hacks that were in place to deal with accidental use
  of both the new and old library in a single process.
* Relief the translators of maintenance burden of similar yet different
  strings.
* Get rid of known bad code without chances of ever getting fixed
  (libnm-glib/nm-object.c and libnm-glib/nm-object-cache.c)
* Generally lower the footprint of the releases and our workspace

If there are some really really legacy users; they can just build
libnm-glib and friends from the NetworkManager-1.16 distribution. The
D-Bus API is stable and old libnm-glib will keep working forever.

https://github.com/NetworkManager/NetworkManager/pull/308

4 files changed, 2 insertions, 99 deletions

diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES
index 4938ae9162..00216e3f89 100755
--- a/contrib/fedora/REQUIRED_PACKAGES
+++ b/contrib/fedora/REQUIRED_PACKAGES
@@ -28,7 +28,6 @@ install \
     bzip2 \
     cscope \
     dbus-devel \
-    dbus-glib-devel \
     dbus-python \
     dbus-x11 \
     dhclient \
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 167c3e4891..0e78fde261 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -7,8 +7,6 @@
 # Note that it contains __PLACEHOLDERS__ that will be replaced by the accompanying 'build.sh' script.
 
 
-%global dbus_glib_version 0.100
-
 %global wireless_tools_version 1:28-0pre9
 
 %global wpa_supplicant_version 1:1.1
@@ -60,11 +58,6 @@
 %bcond_with    test
 %bcond_with    lto
 %bcond_with    sanitizer
-%if 0%{?fedora} > 28 || 0%{?rhel} > 7
-%bcond_with libnm_glib
-%else
-%bcond_without libnm_glib
-%endif
 %if 0%{?fedora}
 %bcond_without connectivity_fedora
 %else
@@ -188,7 +181,6 @@ BuildRequires: intltool
 BuildRequires: gettext-devel
 
 BuildRequires: dbus-devel >= %{dbus_version}
-BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
 %if 0%{?fedora}
 BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
 %endif
@@ -390,37 +382,6 @@ This package contains NetworkManager support for PPP.
 %endif
 
 
-%package glib
-Summary: Libraries for adding NetworkManager support to applications (old API).
-Group: Development/Libraries
-Requires: dbus >= %{dbus_version}
-Requires: dbus-glib >= %{dbus_glib_version}
-Conflicts: NetworkManager-libnm < %{epoch}:%{version}-%{release}
-
-%description glib
-This package contains the libraries that make it easier to use some
-NetworkManager functionality from applications that use glib.  This is
-the older NetworkManager API. See also NetworkManager-libnm.
-
-
-%package glib-devel
-Summary: Header files for adding NetworkManager support to applications (old API).
-Group: Development/Libraries
-Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release}
-Requires: glib2-devel
-Requires: pkgconfig
-Requires: dbus-glib-devel >= %{dbus_glib_version}
-Provides: %{name}-devel = %{epoch}:%{version}-%{release}
-Provides: %{name}-devel%{?_isa} = %{epoch}:%{version}-%{release}
-Obsoletes: %{name}-devel < %{epoch}:%{version}-%{release}
-
-%description glib-devel
-This package contains the header and pkg-config files for development
-applications using NetworkManager functionality from applications that
-use glib.
-This is the older NetworkManager API.  See also NetworkManager-libnm-devel.
-
-
 %package libnm
 Summary: Libraries for adding NetworkManager support to applications (new API).
 Group: Development/Libraries
@@ -622,12 +583,7 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
 	-Dconfig_plugins_default=%{config_plugins_default} \
 	-Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \
 	-Dconfig_logging_backend_default=%{logging_backend_default} \
-	-Djson_validation=true \
-%if %{with libnm_glib}
-	-Dlibnm_glib=true
-%else
-	-Dlibnm_glib=false
-%endif
+	-Djson_validation=true
 
 %meson_build
 
@@ -744,12 +700,7 @@ intltoolize --automake --copy --force
 	--with-config-plugins-default=%{config_plugins_default} \
 	--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
 	--with-config-logging-backend-default=%{logging_backend_default} \
-	--enable-json-validation \
-%if %{with libnm_glib}
-	--with-libnm-glib
-%else
-	--without-libnm-glib
-%endif
+	--enable-json-validation
 
 make %{?_smp_mflags}
 
@@ -859,9 +810,6 @@ fi
 
 
 %if (0%{?fedora} && 0%{?fedora} < 28) || 0%{?rhel}
-%post   glib -p /sbin/ldconfig
-%postun glib -p /sbin/ldconfig
-
 %post   libnm -p /sbin/ldconfig
 %postun libnm -p /sbin/ldconfig
 %endif
@@ -970,47 +918,6 @@ fi
 %endif
 
 
-%if %{with libnm_glib}
-%files glib -f %{name}.lang
-%{_libdir}/libnm-glib.so.*
-%{_libdir}/libnm-glib-vpn.so.*
-%{_libdir}/libnm-util.so.*
-%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
-%{_libdir}/girepository-1.0/NMClient-1.0.typelib
-%endif
-
-
-%if %{with libnm_glib}
-%files glib-devel
-%dir %{_includedir}/libnm-glib
-%dir %{_includedir}/%{name}
-%{_includedir}/libnm-glib/*.h
-%{_includedir}/%{name}/%{name}.h
-%{_includedir}/%{name}/NetworkManagerVPN.h
-%{_includedir}/%{name}/nm-setting*.h
-%{_includedir}/%{name}/nm-connection.h
-%{_includedir}/%{name}/nm-utils-enum-types.h
-%{_includedir}/%{name}/nm-utils.h
-%{_includedir}/%{name}/nm-version.h
-%{_includedir}/%{name}/nm-version-macros.h
-%{_libdir}/pkgconfig/libnm-glib.pc
-%{_libdir}/pkgconfig/libnm-glib-vpn.pc
-%{_libdir}/pkgconfig/libnm-util.pc
-%{_libdir}/pkgconfig/%{name}.pc
-%{_libdir}/libnm-glib.so
-%{_libdir}/libnm-glib-vpn.so
-%{_libdir}/libnm-util.so
-%{_datadir}/gir-1.0/NetworkManager-1.0.gir
-%{_datadir}/gir-1.0/NMClient-1.0.gir
-%dir %{_datadir}/gtk-doc/html/libnm-glib
-%{_datadir}/gtk-doc/html/libnm-glib/*
-%dir %{_datadir}/gtk-doc/html/libnm-util
-%{_datadir}/gtk-doc/html/libnm-util/*
-%{_datadir}/vala/vapi/libnm-*.deps
-%{_datadir}/vala/vapi/libnm-*.vapi
-%endif
-
-
 %files libnm -f %{name}.lang
 %{_libdir}/libnm.so.*
 %{_libdir}/girepository-1.0/NM-1.0.typelib
diff --git a/contrib/fedora/rpm/build_clean.sh b/contrib/fedora/rpm/build_clean.sh
index c486be5129..4efb3088c2 100755
--- a/contrib/fedora/rpm/build_clean.sh
+++ b/contrib/fedora/rpm/build_clean.sh
@@ -148,7 +148,6 @@ if [[ $NO_DIST != 1 ]]; then
         --disable-dependency-tracking \
         --enable-gtk-doc \
         --enable-introspection \
-        --with-libnm-glib \
         --enable-ifcfg-rh \
         --enable-ifupdown \
         --enable-config-plugin-ibft \
diff --git a/contrib/scripts/nm-ci-run.sh b/contrib/scripts/nm-ci-run.sh
index 0ecdaa0384..1e947080dc 100755
--- a/contrib/scripts/nm-ci-run.sh
+++ b/contrib/scripts/nm-ci-run.sh
@@ -100,7 +100,6 @@ run_autotools() {
             \
             --with-ebpf=no \
             \
-            --with-libnm-glib=yes \
             --with-iwd=yes \
             --with-ofono=yes \
             --enable-teamdctl=$_WITH_LIBTEAM \
@@ -171,7 +170,6 @@ run_meson() {
         \
         -D ebpf=false \
         \
-        -D libnm_glib=true \
         -D iwd=true \
         -D ofono=true \
         -D teamdctl=$_WITH_LIBTEAM \