diff --git a/.gitignore b/.gitignore index 4ec63f8..56875f1 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /libnma-1.8.34.tar.xz /libnma-1.8.38.tar.xz /libnma-1.8.40.tar.xz +/libnma-1.10.0.tar.xz diff --git a/libnma.spec b/libnma.spec index 03f61fd..e30f529 100644 --- a/libnma.spec +++ b/libnma.spec @@ -11,14 +11,20 @@ %bcond_with libnma_gtk4 %endif +%if 0%{?fedora} >= 37 || 0%{?rhel} >= 10 +%bcond_without gcr_gtk4 +%else +%bcond_with gcr_gtk4 +%endif + Name: libnma Summary: NetworkManager GUI library -Version: 1.8.40 -Release: 2%{?dist} +Version: 1.10.0 +Release: 1%{?dist} # The entire source code is GPLv2+ except some files in shared/ which are LGPLv2+ License: GPLv2+ and LGPLv2+ URL: https://gitlab.gnome.org/GNOME/libnma/ -Source0: https://download.gnome.org/sources/libnma/1.8/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/libnma/1.10/%{name}-%{version}.tar.xz Patch1: 0001-nm-applet-no-notifications.patch @@ -40,7 +46,12 @@ BuildRequires: pkgconfig BuildRequires: meson BuildRequires: gtk-doc BuildRequires: iso-codes-devel +%if %{with gcr_gtk4} +BuildRequires: gcr-gtk3-devel +BuildRequires: gcr-gtk4-devel +%else BuildRequires: gcr-devel +%endif BuildRequires: mobile-broadband-provider-info-devel >= %{mbp_version} %description @@ -95,9 +106,14 @@ files to be used for integrating GUI tools with NetworkManager. -Dgcr=true \ -Dvapi=false \ %if %{with libnma_gtk4} - -Dlibnma_gtk4=true + -Dlibnma_gtk4=true \ %else - -Dlibnma_gtk4=false + -Dlibnma_gtk4=false \ +%endif +%if %{with gcr_gtk4} + -Dgcr_gtk4=true +%else + -Dgcr_gtk4=false %endif %meson_build diff --git a/sources b/sources index 39e9197..86ab45b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libnma-1.8.40.tar.xz) = 28f4704f97941308f43b27a309fd14050e8ac7e0c6665cada3cc08a759e140f043a80b21ccfe02ce348f8490cad8107b4fe27026dbaafed46ec1c7c46824e3b8 +SHA512 (libnma-1.10.0.tar.xz) = c6d529dbf9023739585eb5148613a147752054a26e61851b23f7c05afdec74a58c1df698cbea77e0161f4e83bda12c1a6b45070086488a7b8eef70a28209a3fb