diff --git a/backport-fix-build-faile-on-meson-0.6-version.patch b/backport-fix-build-faile-on-meson-0.6-version.patch deleted file mode 100644 index 6645c10ccddcae2932a7b96f57a060a48d50ed6f..0000000000000000000000000000000000000000 --- a/backport-fix-build-faile-on-meson-0.6-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 30f91940819bf48a8b61599732c6b1ecea8fedf1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -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 diff --git a/network-manager-applet-1.30.0.tar.xz b/network-manager-applet-1.30.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..9bf30d4f641ec2130bc11b1e3e2deeff0a360b59 Binary files /dev/null and b/network-manager-applet-1.30.0.tar.xz differ diff --git a/network-manager-applet.spec b/network-manager-applet.spec index b30737653331727f51c90f9e9336904ef4719a44..4d4fa4247c74a4f97351d974ae586db502ef8658 100755 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -3,21 +3,17 @@ %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.30.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: 4 +Version: 1.30.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.30/%{name}-%{version}.tar.xz Requires: NetworkManager >= %{nm_version} libnotify >= 0.4.3 nm-connection-editor libnma @@ -82,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 @@ -91,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 +%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml %{_datadir}/GConf/gsettings/nm-applet.convert %{_sysconfdir}/xdg/autostart/nm-applet.desktop @@ -112,6 +110,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_datadir}/metainfo/nm-connection-editor.appdata.xml %changelog +* Tue Feb 07 2023 zhouwenpei - 1.30.0-1 +- update to 1.30.0 + * Mon Jan 09 2023 zhangpan - 1.24.0-4 - Type:bugfix - CVE: