0001-meson-build-separate-UI-sources-for-GTK3-and-GTK4-li.patch

@@ -0,0 +1,56 @@
+From 40b591aaa0fcbc2bf37f89909477d59a102a5fa4 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 18 Mar 2022 15:56:12 -0700
+Subject: [PATCH] meson: build separate UI sources for GTK3 and GTK4 libraries
+
+We can't just do one or the other, each build of the library
+needs the correct respective UI resources.
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+---
+ src/meson.build    |  2 +-
+ src/ui/meson.build | 18 ++++++++++--------
+ 2 files changed, 11 insertions(+), 9 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 6e1a15e4..efe3fb03 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -103,7 +103,7 @@ libnma_dep = declare_dependency(
+ if enable_libnma_gtk4
+   libnma_gtk4 = shared_library(
+     'nma-gtk4',
+-    sources: gir_sources + ui_sources,
++    sources: gir_sources + ui_sources4,
+     version: libversion,
+     include_directories: incs,
+     dependencies: [ deps, gtk4_dep ],
+diff --git a/src/ui/meson.build b/src/ui/meson.build
+index 2f8eec99..60dbaeef 100644
+--- a/src/ui/meson.build
++++ b/src/ui/meson.build
+@@ -1,11 +1,13 @@
+-if enable_libnma_gtk4
+-  ui_dir = 'gtk4'
+-else
+-  ui_dir = 'gtk3'
+-endif
+-
+ ui_sources = gnome.compile_resources(
+   'nma-resources',
+-  join_paths(ui_dir, 'nma.gresource.xml'),
+-  source_dir: ui_dir
++  join_paths('gtk3', 'nma.gresource.xml'),
++  source_dir: 'gtk3'
+ )
++
++if enable_libnma_gtk4
++  ui_sources4 = gnome.compile_resources(
++    'nma-resources4',
++    join_paths('gtk4', 'nma.gresource.xml'),
++    source_dir: 'gtk4'
++  )
++endif
+-- 
+2.35.1
+

libnma.spec

@@ -3,18 +3,25 @@
 %global glib2_version         %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 %global nm_version            1:1.8.0
 %global mbp_version           0.20090602
-%global old_libnma_version    1.10.4
+%global old_libnma_version    1.8.27
+
+%global rpm_version 1.8.34
+%global real_version 1.8.34
+%global release_version 2
+
+%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:           libnma
 Summary:        NetworkManager GUI library
-Version:        1.10.6
+Version:        %{rpm_version}
-Release:        1
+Release:        %{release_version}
 License:        GPLv2+ and LGPLv2+
 URL:            https://gitlab.gnome.org/GNOME/libnma/
-Source0:        https://download.gnome.org/sources/libnma/1.10/%{name}-%{version}.tar.xz
+Source0:        https://download.gnome.org/sources/libnma/%{real_version_major}/%{name}-%{real_version}.tar.xz
 
 Patch1:         0001-nm-applet-no-notifications.patch
-Patch9000:      remove-sensitive-info.patch
+Patch2:         0001-Ship-and-compile-both-GTK3-and-GTK4-UI-files.patch
+Patch3:         0001-meson-build-separate-UI-sources-for-GTK3-and-GTK4-li.patch
 
 Requires:       mobile-broadband-provider-info >= %{mbp_version}
 Conflicts:      libnma < %{old_libnma_version}
@@ -30,6 +37,7 @@ BuildRequires:  gtk4-devel >= 4.0
 This package contains the library used for integrating GUI tools with
 NetworkManager.
 
+
 %package devel
 Summary:        Header files for NetworkManager GUI library
 Requires:       NetworkManager-libnm-devel >= %{nm_version}
@@ -47,13 +55,14 @@ This package contains header and pkg-config files to be used for integrating
 GUI tools with NetworkManager.
 
 %prep
-%autosetup -p1 -n "%{name}-%{version}"
+%autosetup -p1 -n "%{name}-%{real_version}"
 
 %build
 %meson \
         -Dgcr=true \
         -Dvapi=false \
         -Dlibnma_gtk4=true \
+        -Dmobile_broadband_provider_info=false
 %meson_build
 
 %install
@@ -72,7 +81,6 @@ GUI tools with NetworkManager.
 %{_libdir}/girepository-1.0/NMA-1.0.typelib
 %{_libdir}/girepository-1.0/NMA4-1.0.typelib
 %{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.gschema.xml
-%{_datadir}/glib-2.0/schemas/org.gnome.nm-applet.eap.gschema.xml
 
 %files devel
 %defattr(-,root,root)
@@ -86,28 +94,13 @@ GUI tools with NetworkManager.
 %{_datadir}/gtk-doc
 
 %changelog
-* Tue Jul 11 2023 liyanan <thistleslyn@163.com> - 1.10.6-1
-- update to 1.10.6
-
-* Mon Jun 12 2023 zhangpan <zhangpan103@h-partners.com> - 1.10.4-3
-- remove sensitive info
-
-* Thu Mar 9 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 1.10.4-2
-- fix network configuration parameters invalid
-
-* Mon Jan 2 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.10.4-1
-- Update to 1.10.4
-
-* Mon Jun 13 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 1.8.38-1
-- Update to 1.8.38
-
 * Fri Jun 17 liyanan <liyanan32@h-partners.com> - 1.8.34-2
 - Drop disable-static from meson command line
 
 * Wed Apr 20 2022 dillon chen <dillon.chen@gmail.com> - 1.8.34-1
-- fix UI files in GTK4
+- fix UI files in GTK4 
 - Enable gtk4 subpackage
-- Update to 1.8.34
+- Update to 1.8.34 
 
 * Thu Dec 30 2021 yanan <yanan@huawei.com> - 1.8.32-1
 - upgrade to libnma-1.8.32

libnma.yaml

@@ -1,4 +0,0 @@
-version_control: gitlab.gnome
-src_repo: libnma
-tag_prefix: ^
-separator: .

remove-sensitive-info.patch

@@ -1,24 +0,0 @@
-From d0fa74e1de2545e1678cdada73aad08ffcca099d Mon Sep 17 00:00:00 2001
-From: zhouwenpei <zhouwenpei1@h-partners.com>
-Date: Tue, 31 Jan 2023 22:52:08 +0800
-Subject: [PATCH] remove sensitive info
- 
----
- src/nma-mobile-providers.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/nma-mobile-providers.c b/src/nma-mobile-providers.c
-index 95f352f..b1a67d0 100644
---- a/src/nma-mobile-providers.c
-+++ b/src/nma-mobile-providers.c
-@@ -1044,7 +1044,6 @@ static void
- dump_generic (NMAMobileAccessMethod *method)
- {
- 	g_print ("		  username: %s\n", method->username ? method->username : "");
--	g_print ("		  password: %s\n", method->password ? method->password : "");
- 
- 	if (method->dns) {
- 		guint i;
--- 
-2.27.0
-