From 7a46dfa9eb357216709d7c18a4beb40a8bc0c594 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Fri, 6 Dec 2024 09:42:51 +0300
Subject: [PATCH] import network-manager-applet-1.36.0-4.el10

---
 SPECS/network-manager-applet.spec | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/SPECS/network-manager-applet.spec b/SPECS/network-manager-applet.spec
index 6ff12ea..78c6805 100644
--- a/SPECS/network-manager-applet.spec
+++ b/SPECS/network-manager-applet.spec
@@ -20,7 +20,7 @@
 Name: network-manager-applet
 Summary: A network control and status applet for NetworkManager
 Version: 1.36.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPL-2.0-or-later
 URL: http://www.gnome.org/projects/NetworkManager/
 Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
@@ -100,21 +100,33 @@ environment.
 %install
 %meson_install
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
-
+%if 0%{?rhel} >= 10
+rm $RPM_BUILD_ROOT%{_bindir}/nm-applet
+rm $RPM_BUILD_ROOT%{_datadir}/applications/nm-applet.desktop
+rm $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
+rm $RPM_BUILD_ROOT%{_mandir}/man1/nm-applet*
+rm $RPM_BUILD_ROOT%{_datadir}/locale/*/LC_MESSAGES/nm-applet.mo
+%else
 %find_lang nm-applet
 cat nm-applet.lang >> %{name}.lang
-
+%endif
 # validate .desktop and autostart files
+%if 0%{?rhel} >= 10
+desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
+%else
 desktop-file-validate $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/nm-applet.desktop
 desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-editor.desktop
+%endif
 
 %check
 %meson_test
 
 
 %files
+%if 0%{?fedora} || 0%{?rhel} < 10
 %{_bindir}/nm-applet
 %{_datadir}/applications/nm-applet.desktop
+%endif
 %{_datadir}/icons/hicolor/22x22/apps/nm-adhoc.png
 %{_datadir}/icons/hicolor/22x22/apps/nm-insecure-warn.png
 %{_datadir}/icons/hicolor/22x22/apps/nm-mb-roam.png
@@ -128,21 +140,25 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
 %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
 %{_datadir}/GConf/gsettings/nm-applet.convert
+%if 0%{?fedora} || 0%{?rhel} < 10
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %{_mandir}/man1/nm-applet*
+%endif
 %doc NEWS CONTRIBUTING
 %license COPYING
 
 # Yes, lang files for the applet go in nm-connection-editor RPM since it
 # is the RPM that everything else depends on
-%files -n nm-connection-editor -f %{name}.lang
+%files -n nm-connection-editor
 %{_bindir}/nm-connection-editor
 %{_datadir}/icons/hicolor/*/apps/nm-device-*.*
 %{_datadir}/icons/hicolor/*/apps/nm-no-connection.*
 %{_datadir}/icons/hicolor/16x16/apps/nm-vpn-standalone-lock.png
 %{_mandir}/man1/nm-connection-editor*
 %dir %{_datadir}/gnome-vpn-properties
-
+%if 0%{?fedora} || 0%{?rhel} < 10
+%{name}.lang
+%endif
 
 %files -n nm-connection-editor-desktop
 %{_datadir}/applications/nm-connection-editor.desktop
@@ -150,6 +166,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 
 
 %changelog
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.36.0-4
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
 * Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1.36.0-3
 - Rebuilt for MSVSphere 10