!39 update to 1.36.0

From: @zppzhangpan 
Reviewed-by: @robertxw 
Signed-off-by: @robertxw

Modify-the-prompt-for-cloning-a-MAC-address.patch

@@ -0,0 +1,28 @@
+From f8c68e81d69c8447120ade01115c39a811061b60 Mon Sep 17 00:00:00 2001
+From: liyuanyuan <liyuanyuan@xfusion.com>
+Date: Thu, 15 Dec 2022 15:49:57 +0800
+Subject: [PATCH] Modify the prompt for cloning a MAC address
+
+---
+ po/zh_CN.po | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/po/zh_CN.po b/po/zh_CN.po
+index 93789f0..7944ff6 100644
+--- a/po/zh_CN.po
++++ b/po/zh_CN.po
+@@ -2937,8 +2937,8 @@ msgid ""
+ "network device this connection is activated on. This feature is known as MAC "
+ "cloning or spoofing. Example: 00:11:22:33:44:55"
+ msgstr ""
+-"此处输入的 MAC 地址将用作此连接激活所在的网络设备的硬件地址。该特性被称为 "
+-"MAC 克隆或欺骗。例如：00:11:22:33:44:55"
++"此处输入的 MAC 地址将用作此连接激活所在网络设备的硬件地址。该特性被称作 "
++"MAC 克隆或 MAC 地址欺骗。例如：00:11:22:33:44:55"
+ 
+ #: src/connection-editor/ce-page.c:321
+ msgid "MAC address"
+-- 
+2.27.0
+
+

backport-fix-build-faile-on-meson-0.6-version.patch

@@ -1,32 +0,0 @@
-From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001
-From: Alexander Kanavin <alex@linutronix.de>
-Date: Fri, 21 Jan 2022 22:34:09 +0100
-Subject: [PATCH] meson.build: address meson 0.61 failures
-
-https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/107
----
- meson.build | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 33adb632..6178c0eb 100644
---- a/meson.build
-+++ b/meson.build
-@@ -254,7 +254,6 @@ desktop_file_validate = find_program('desktop-file-validate', required: false)
- 
- foreach desktop: desktop_files
-   i18n.merge_file(
--    desktop + '-desktop',
-     input: desktop + '.desktop.in',
-     output: desktop + '.desktop',
-     install: true,
-@@ -275,7 +274,6 @@ endforeach
- appdata = 'nm-connection-editor.appdata.xml'
- 
- i18n.merge_file(
--  'desktop',
-   input: appdata + '.in',
-   output: appdata,
-   install: true,
--- 
-GitLab

network-manager-applet.spec

@@ -3,28 +3,26 @@
 %global nm_version      1:1.16.0
 %global libnma_version  1.8.27
 %global obsoletes_ver   1:0.9.7
-%global rpm_version 1.24.0
-%global real_version 1.24.0
-%global release_version 1 
+%global real_version 1.36.0
 %global real_version_major %(printf '%s' '%{real_version}' | sed -n 's/^\\([1-9][0-9]*\\.[1-9][0-9]*\\)\\.[1-9][0-9]*$/\\1/p')
  
 Name: network-manager-applet
 Summary: A network control and status applet for NetworkManager
-Version: 1.24.0
-Release: 3
+Version: 1.36.0
+Release: 1
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
-Source:  https://download.gnome.org/sources/network-manager-applet/1.24/%{name}-%{version}.tar.xz
- 
-Patch6000: backport-fix-build-faile-on-meson-0.6-version.patch
+Source:  https://download.gnome.org/sources/network-manager-applet/1.36/%{name}-%{version}.tar.xz
 
 Requires: NetworkManager >= %{nm_version} libnotify >= 0.4.3 nm-connection-editor libnma
 
+Patch1:   Modify-the-prompt-for-cloning-a-MAC-address.patch
+
 BuildRequires: NetworkManager-libnm-devel >= %{nm_version} libnma-devel ModemManager-glib-devel >= 1.0 glib2-devel >= 2.32 gtk3-devel >= 3.10
 BuildRequires: gobject-introspection-devel >= 0.10.3 gettext-devel pkgconfig libnotify-devel >= 0.4 meson intltool gtk-doc
 BuildRequires: /usr/bin/autopoint mobile-broadband-provider-info-devel libselinux-devel  libappindicator-gtk3-devel libdbusmenu-gtk3-devel
-BuildRequires: desktop-file-utils iso-codes-devel libgudev1-devel >= 147 libsecret-devel >= 0.12 jansson-devel gcr-devel
+BuildRequires: desktop-file-utils iso-codes-devel libsecret-devel >= 0.12 jansson-devel gcr-devel
 
 %description
 This package contains a network control and status notification area applet
@@ -51,6 +49,9 @@ environment.
 
 %prep
 %autosetup -n %{name}-%{real_version} -p1
+cd po/
+rm -f zh_CN.gmo && msgfmt zh_CN.po -o zh_CN.gmo
+cd -
  
 %build
 %meson \
@@ -77,6 +78,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %{_bindir}/nm-applet
 %{_datadir}/applications/nm-applet.desktop
 %{_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
 %{_datadir}/icons/hicolor/22x22/apps/nm-secure-lock.png
 %{_datadir}/icons/hicolor/22x22/apps/nm-signal-*.png
@@ -86,6 +88,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-connecting*.png
 %{_datadir}/icons/hicolor/22x22/apps/nm-wwan-tower.png
 %{_datadir}/icons/hicolor/scalable/apps/*.svg
+%exclude %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
 %{_datadir}/GConf/gsettings/nm-applet.convert
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 
@@ -106,7 +109,24 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %{_datadir}/applications/nm-connection-editor.desktop
 %{_datadir}/metainfo/nm-connection-editor.appdata.xml
 
-%changelog 
+%changelog
+* Tue Jan 16 2024 zhangpan <zhangpan103@h-partners.com> - 1.36.0-1
+- update to 1.36.0
+
+* Thu Jul 20 2023 zhangpan <zhangpan103@h-partners.com> - 1.32.0-1
+- update to 1.32.0
+
+* Tue Feb 14 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.30.0-2
+- fix file conflicts and remove old tar
+
+* Tue Feb 07 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.30.0-1
+- update to 1.30.0
+
+* Mon Jan 09 2023 zhangpan<zhangpan@h-partners.com> - 1.24.0-4
+- Type:bugfix
+- CVE:
+- DESC:Modify the prompt for cloning a MAC address
+
 * Mon Jun 20 2022 wangkerong <wangkerong@h-partners.com> - 1.24.0-3
 - delete unnecessary meson options and fix build faile on meson-0.6