upgrade to 1.8.34

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

@@ -1,40 +1,54 @@
 %global gtk3_version          %(pkg-config --modversion gtk+-3.0 2>/dev/null || echo bad)
+%global gtk4_version          %(pkg-config --modversion gtk4 2>/dev/null || echo bad)
 %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.8.30
-%global rpm_version 1.8.32
-%global real_version 1.8.32
-%global release_version 1
+%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:        %{rpm_version}
-Release:        %{release_version}
+Release:        %{release_version}%{?dist}
 License:        GPLv2+ and LGPLv2+
 URL:            https://gitlab.gnome.org/GNOME/libnma/
 Source0:        https://download.gnome.org/sources/libnma/%{real_version_major}/%{name}-%{real_version}.tar.xz
-Patch1:         0001-nm-applet-no-notifications.patch
 
-Obsoletes:      libnma < %{old_libnma_version}
+Patch1:         0001-nm-applet-no-notifications.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}
 
 BuildRequires:  gcc gettext-devel pkgconfig meson gtk-doc  iso-codes-devel gcr-devel
-BuildRequires:  NetworkManager-libnm-devel >= %{nm_version}  gtk3-devel >= 3.10
-BuildRequires:  ModemManager-glib-devel >= 1.0  glib2-devel >= 2.32
+BuildRequires:  NetworkManager-libnm-devel >= %{nm_version}  gtk3-devel >= 3.12
+BuildRequires:  ModemManager-glib-devel >= 1.0  glib2-devel >= 2.38
 BuildRequires:  gobject-introspection-devel >= 0.10.3 pkgconfig
 BuildRequires:  mobile-broadband-provider-info-devel >= %{mbp_version}
+BuildRequires:  gtk4-devel >= 4.0
 
 %description
 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}
 Obsoletes:      NetworkManager-gtk-devel < 1:0.9.7
-Requires:       libnma = %{version}-%{release} pkgconfig  gtk3-devel
-Obsoletes:      libnma < %{old_libnma_version}
+Requires:       libnma%{?_isa} = %{version}-%{release}
+Requires:       gtk3-devel%{?_isa}
+Requires:       pkgconfig
+Requires:       gtk4%{?_isa} >= %{gtk4_version}
+Requires:       gtk4-devel%{?_isa}
+Requires:       mobile-broadband-provider-info >= %{mbp_version}
+Conflicts:      libnma < %{old_libnma_version}
 
 %description devel
 This package contains header and pkg-config files to be used for integrating
@@ -48,7 +62,7 @@ GUI tools with NetworkManager.
         -Dgcr=true \
         -Ddisable-static=true \
         -Dvapi=false \
-        -Dlibnma_gtk4=false \
+        -Dlibnma_gtk4=true \
         -Dmobile_broadband_provider_info=false
 %meson_build
 
@@ -64,18 +78,28 @@ GUI tools with NetworkManager.
 %doc NEWS CONTRIBUTING
 %license COPYING
 %{_libdir}/libnma.so.*
+%{_libdir}/libnma-gtk4.so.*
 %{_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
 
 %files devel
 %defattr(-,root,root)
 %{_includedir}/libnma
 %{_libdir}/pkgconfig/libnma.pc
+%{_libdir}/pkgconfig/libnma-gtk4.pc
 %{_libdir}/libnma.so
+%{_libdir}/libnma-gtk4.so
 %{_datadir}/gir-1.0/NMA-1.0.gir
+%{_datadir}/gir-1.0/NMA4-1.0.gir
 %{_datadir}/gtk-doc
 
 %changelog
+* Wed Apr 20 2022 dillon chen <dillon.chen@gmail.com> - 1.8.34-1
+- fix UI files in GTK4 
+- Enable gtk4 subpackage
+- Update to 1.8.34 
+
 * Thu Dec 30 2021 yanan <yanan@huawei.com> - 1.8.32-1
 - upgrade to libnma-1.8.32
 - remove the installation dependency on mobile-broadband-provider-info