import network-manager-applet-1.24.0-4.el8

.gitignore

@@ -1 +1 @@
-SOURCES/network-manager-applet-1.18.0.tar.xz
+SOURCES/network-manager-applet-1.24.0.tar.xz

.network-manager-applet.metadata

@@ -1 +1 @@
-6d79ca3373212df29e20fbcc49a6ab33d01c3120 SOURCES/network-manager-applet-1.18.0.tar.xz
+ad47fc9a88987bc07e2fb86521c6d55b30b953c9 SOURCES/network-manager-applet-1.24.0.tar.xz

SOURCES/0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch

@@ -0,0 +1,60 @@
+From 38731695f7b38d867e51b3d5cee2d0281c315a71 Mon Sep 17 00:00:00 2001
+From: Ana Cabral <acabral@redhat.com>
+Date: Mon, 21 Feb 2022 16:32:27 +0100
+Subject: [PATCH] Wi-Fi/OWE: Fix Enhanced Open (OWE) not being saved properly
+ from nm-connection-editor
+
+When we create a Wi-Fi connection using Enhanced Open (OWE) Security
+from nm-connection-editor and save it, it was not being saved and the
+security was being set as "None", with Wireless Security Setting
+being discarded. This was fixed.
+
+This fix is temporary fix. It should (and will) be done from libnma,
+OWE should be implemented in libnma. Meanwhile this gets done,
+this solution handles this issue.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=2023156
+
+Fixes: b85ed300781ce9f26df9cf8e659d1bc0bc173201
+
+https://gitlab.gnome.org/GNOME/network-manager-applet/-/merge_requests/108
+---
+ src/connection-editor/page-wifi-security.c | 22 ++++++++++++++++++----
+ 1 file changed, 18 insertions(+), 4 deletions(-)
+
+diff --git a/src/connection-editor/page-wifi-security.c b/src/connection-editor/page-wifi-security.c
+index e8c9d7e2..e8086452 100644
+--- a/src/connection-editor/page-wifi-security.c
++++ b/src/connection-editor/page-wifi-security.c
+@@ -580,10 +580,24 @@ ce_page_validate_v (CEPage *page, NMConnection *connection, GError **error)
+ 
+ 		g_object_unref (ws);
+ 	} else {
+-		/* No security, unencrypted */
+-		nm_connection_remove_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
+-		nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
+-		valid = TRUE;
++
++		if (gtk_combo_box_get_active (priv->security_combo) == 0) {
++			/* No security, unencrypted */
++			nm_connection_remove_setting (connection, NM_TYPE_SETTING_WIRELESS_SECURITY);
++			nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
++			valid = TRUE;
++		} else {
++			/* owe case:
++			 * fill the connection manually until libnma implements OWE wireless security
++			 */
++			NMSetting *s_wireless_sec;
++
++			s_wireless_sec = nm_setting_wireless_security_new ();
++			g_object_set (s_wireless_sec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "owe", NULL);
++			nm_connection_add_setting (connection, s_wireless_sec);
++			nm_connection_remove_setting (connection, NM_TYPE_SETTING_802_1X);
++			valid = TRUE;
++		}
+ 	}
+ 
+ 	return valid;
+-- 
+2.35.1
+

SPECS/network-manager-applet.spec

@@ -5,9 +5,9 @@
 %global libnma_version  1.8.27
 %global obsoletes_ver   1:0.9.7
 
-%global rpm_version 1.18.0
+%global rpm_version 1.24.0
-%global real_version 1.18.0
+%global real_version 1.24.0
-%global release_version 3
+%global release_version 4
 
 %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')
 
@@ -17,18 +17,23 @@
 %bcond_without libnma_gtk4
 %endif
 
+%if 0%{?fedora} || 0%{?rhel} < 9
+%bcond_without appindicator
+%else
+%bcond_with appindicator
+%endif
+
 Name: network-manager-applet
 Summary: A network control and status applet for NetworkManager
 Version: %{rpm_version}
 Release: %{release_version}%{?dist}
-Group: Applications/System
 License: GPLv2+
 URL: http://www.gnome.org/projects/NetworkManager/
 Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
 
 Source: https://download.gnome.org/sources/network-manager-applet/%{real_version_major}/%{name}-%{real_version}.tar.xz
-Patch1: 0001-Import-translations-rh1820554.patch
+# Patch1: 0001-Patch.patch
-Patch2: 0002-Update-German-translation-rh1938625.patch
+Patch1: 0001-Wi-Fi-OWE-Fix-Enhanced-Open-OWE-not-being-saved-prop.patch
 
 Requires: NetworkManager >= %{nm_version}
 Requires: libnotify >= 0.4.3
@@ -59,8 +64,12 @@ BuildRequires: jansson-devel
 BuildRequires: gcr-devel
 BuildRequires: libselinux-devel
 BuildRequires: mobile-broadband-provider-info-devel
+%if %{with appindicator}
 BuildRequires: libappindicator-gtk3-devel
+%endif
+%if 0%{?fedora} || 0%{?rhel} < 9
 BuildRequires: libdbusmenu-gtk3-devel
+%endif
 
 %description
 This package contains a network control and status notification area applet
@@ -83,7 +92,11 @@ utility for use with NetworkManager.
     -Dgcr=true \
     -Dselinux=true \
     -Ddisable-static=true \
+%if %{with appindicator}
     -Dappindicator=yes
+%else
+    -Dappindicator=no
+%endif
 %meson_build
 
 %install
@@ -113,6 +126,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 %{_datadir}/icons/hicolor/22x22/apps/nm-vpn-active-lock.png
 %{_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}/GConf/gsettings/nm-applet.convert
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
 %{_mandir}/man1/nm-applet*
@@ -133,6 +147,18 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit
 
 
 %changelog
+* Tue Feb 22 2022 Ana Cabral <acabral@redhat.com> - 1.24.0-4
+- Fix OWE settings disappearing on nm-connection-editor (rh #2023162)
+
+* Mon Nov 22 2021 Ana Cabral <acabral@redhat.com> - 1.24.0-3
+- Update the spec file
+
+* Tue Sep 14 2021 Ana Cabral <acabral@redhat.com> - 1.24.0-2
+- Rebuild package
+
+* Mon Sep 6 2021 Ana Cabral <acabral@redhat.com> - 1.24.0-1
+- Update to 1.24.0 release (rh #2001638)
+
 * Mon Aug 16 2021 Ana Cabral <acabral@redhat.com> - 1.18.0-3
 - Fix German translation (rh #1938625, rh #1938627)