From e0924f3df7166d3ab2930d3d99544e872f6a9485 Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Fri, 5 Jan 2024 17:49:47 +0100
Subject: [PATCH] x86_64, aarch64: force setting libexecdir as /usr/libexec to
 fix compatibility with dracut module [release 1.40.4-2mamba;Wed Nov 23 2022]

---
 NetworkManager.spec | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/NetworkManager.spec b/NetworkManager.spec
index 9aeb2af..a706734 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -2,7 +2,7 @@
 %define pppdver %(rpm -q --queryformat '%%{version}\\n' ppp | head -n1)
 Name:          NetworkManager
 Version:       1.40.4
-Release:       1mamba
+Release:       2mamba
 Summary:       A hardware level network management tool integrated with D-Bus
 Group:         System/Kernel and Hardware
 Vendor:        openmamba
@@ -95,6 +95,7 @@ This package includes the %{name} API documentation.
 
 %build
 %meson \
+   --libexecdir %{_prefix}/libexec \
    -D udev_dir=%{_prefix}/lib/udev \
    -D tests=yes \
    -D docs=true \
@@ -200,6 +201,7 @@ fi
 %{_bindir}/nm-online
 %{_udevrulesdir}/*.rules
 %{_prefix}/lib/firewalld/zones/nm-shared.xml
+%{_prefix}/libexec/nm-*
 %{_unitdir}/NetworkManager.service
 %{_unitdir}/NetworkManager-dispatcher.service
 %{_unitdir}/NetworkManager-wait-online.service
@@ -234,7 +236,6 @@ fi
 %{_libdir}/NetworkManager/%{version}/libnm-ppp-plugin.so
 %{_libdir}/NetworkManager/%{version}/libnm-wwan.so
 %{_libdir}/pppd/*/nm-pppd-plugin.so
-%{_libexecdir}/nm-*
 %{_libdir}/girepository-1.0/NM-1.0.typelib
 #%{_libdir}/girepository-1.0/NMClient-1.0.typelib
 #%{_libdir}/girepository-1.0/NetworkManager-1.0.typelib
@@ -244,39 +245,27 @@ fi
 %defattr(-,root,root)
 %dir %{_includedir}/libnm
 %{_includedir}/libnm/*.h
-#%{_includedir}/libnm-glib/libnm_glib.h
-#%{_includedir}/libnm-glib/nm-*.h
-#%{_libdir}/libnm-glib-vpn.so
-#%{_libdir}/libnm-glib.so
-#%{_libdir}/libnm-util.so
 %{_libdir}/libnm.so
 %{_datadir}/gir-1.0/NM-1.0.gir
-#%{_datadir}/gir-1.0/NMClient-1.0.gir
-#%{_datadir}/gir-1.0/NetworkManager-1.0.gir
-#%{_datadir}/vala/vapi/libnm-glib.deps
-#%{_datadir}/vala/vapi/libnm-glib.vapi
-#%{_datadir}/vala/vapi/libnm-util.deps
-#%{_datadir}/vala/vapi/libnm-util.vapi
 %{_datadir}/vala/vapi/libnm.deps
 %{_datadir}/vala/vapi/libnm.vapi
 %{_libdir}/pkgconfig/*.pc
-#%doc ChangeLog NEWS README TODO
+%doc ChangeLog NEWS README.md TODO
 
 %files apidocs
 %defattr(-,root,root)
 %dir %{_datadir}/gtk-doc/html/NetworkManager
 %{_datadir}/gtk-doc/html/NetworkManager/*
-#%dir %{_datadir}/gtk-doc/html/libnm-glib
-#%{_datadir}/gtk-doc/html/libnm-glib/*
 %dir %{_datadir}/gtk-doc/html/libnm
 %{_datadir}/gtk-doc/html/libnm/*
-#%dir %{_datadir}/gtk-doc/html/libnm-util
-#%{_datadir}/gtk-doc/html/libnm-util/*
 %dir %{_datadir}/doc/NetworkManager
 %dir %{_datadir}/doc/NetworkManager/examples
 %{_datadir}/doc/NetworkManager/examples/server.conf
 
 %changelog
+* Wed Nov 23 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 1.40.4-2mamba
+- x86_64, aarch64: force setting libexecdir as /usr/libexec to fix compatibility with dracut module
+
 * Sat Nov 19 2022 Automatic Build System <autodist@mambasoft.it> 1.40.4-1mamba
 - automatic version update by autodist