From 299a6af3eedb928b50d7ad8edb311726d0ab3bbf Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 28 Apr 2021 15:44:05 +0200
Subject: [PATCH 1/2] build: install D-Bus service files to /usr by default

Service files shipped by distribution should be in /usr.
---
 configure.ac | 2 +-
 meson.build  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index dbe3bc8ea3..abc283c83d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -727,7 +727,7 @@ AC_ARG_WITH(dbus-sys-dir,
 if test -n "$with_dbus_sys_dir" ; then
 	DBUS_SYS_DIR="$with_dbus_sys_dir"
 else
-	DBUS_SYS_DIR="${sysconfdir}/dbus-1/system.d"
+	DBUS_SYS_DIR="${datadir}/dbus-1/system.d"
 fi
 AC_SUBST(DBUS_SYS_DIR)
 
diff --git a/meson.build b/meson.build
index f1c5f082e2..24e50ddef4 100644
--- a/meson.build
+++ b/meson.build
@@ -552,7 +552,7 @@ endif
 dbus_conf_dir = get_option('dbus_conf_dir')
 if dbus_conf_dir == ''
   assert(dbus_dep.found(), 'D-Bus required but not found, please provide a valid system bus config dir')
-  dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('sysconfdir', define_variable: ['sysconfdir', nm_sysconfdir]), 'dbus-1', 'system.d')
+  dbus_conf_dir = join_paths(dbus_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'system.d')
 endif
 
 dbus_interfaces_dir = dbus_dep.get_pkgconfig_variable('interfaces_dir',  define_variable: ['datadir', nm_datadir])

From aaed69e5d760ef359ac32d535828863513d1269c Mon Sep 17 00:00:00 2001
From: Beniamino Galvani <bgalvani@redhat.com>
Date: Wed, 28 Apr 2021 15:49:28 +0200
Subject: [PATCH 2/2] contrib/rpm: install D-Bus service files to /usr in RHEL8

When supported by the D-Bus daemon, it's better to have service files
in /usr rather than in /etc. Change the path for RHEL 8.

See also commit ef8c29288149 ('contrib/rpm: install D-Bus service
files to /usr if we can').
---
 contrib/fedora/rpm/NetworkManager.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 20496c17f7..e75f26001b 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -113,7 +113,7 @@
 
 ###############################################################################
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} > 7
 %global dbus_version 1.9.18
 %global dbus_sys_dir %{_datadir}/dbus-1/system.d
 %else