From fb7d527d29da4074bd63a78e5524b2084e1da16c Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Apr 13 2022 02:10:26 +0000
Subject: import libnma-1.8.38-1.el8


---

diff --git a/.gitignore b/.gitignore
index 66110be..6dd100b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/libnma-1.8.36.tar.xz
+SOURCES/libnma-1.8.38.tar.xz
diff --git a/.libnma.metadata b/.libnma.metadata
index facc9ec..af7414c 100644
--- a/.libnma.metadata
+++ b/.libnma.metadata
@@ -1 +1 @@
-5ee2bec31c5feeecea7b777d9cd6d7224b7e50f5 SOURCES/libnma-1.8.36.tar.xz
+15b3ef1432fe5254ad4e4ab555840465176c47b3 SOURCES/libnma-1.8.38.tar.xz
diff --git a/SPECS/libnma.spec b/SPECS/libnma.spec
index 736d0e7..5ca29f4 100644
--- a/SPECS/libnma.spec
+++ b/SPECS/libnma.spec
@@ -5,22 +5,20 @@
 %global mbp_version           0.20090602
 %global old_libnma_version    1.8.27
 
-%global rpm_version 1.8.36
-%global real_version 1.8.36
-%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')
-
+%if 0%{?fedora} >= 34 || 0%{?rhel} >= 10
+%bcond_without libnma_gtk4
+%else
 %bcond_with libnma_gtk4
+%endif
 
 Name:           libnma
 Summary:        NetworkManager GUI library
-Version:        %{rpm_version}
-Release:        %{release_version}%{?dist}
+Version:        1.8.38
+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/%{real_version_major}/%{name}-%{real_version}.tar.xz
+Source0:        https://download.gnome.org/sources/libnma/1.8/%{name}-%{version}.tar.xz
 
 Patch1:         0001-nm-applet-no-notifications.patch
 
@@ -31,10 +29,10 @@ Conflicts:      libnma < %{old_libnma_version}
 BuildRequires:  gcc
 BuildRequires:  NetworkManager-libnm-devel >= %{nm_version}
 BuildRequires:  ModemManager-glib-devel >= 1.0
-BuildRequires:  glib2-devel >= 2.32
-BuildRequires:  gtk3-devel >= 3.10
+BuildRequires:  glib2-devel >= 2.38
+BuildRequires:  gtk3-devel >= 3.12
 %if %{with libnma_gtk4}
-BuildRequires:  gtk4-devel >= 3.96
+BuildRequires:  gtk4-devel >= 4.0
 %endif
 BuildRequires:  gobject-introspection-devel >= 0.10.3
 BuildRequires:  gettext-devel
@@ -89,13 +87,12 @@ files to be used for integrating GUI tools with NetworkManager.
 
 
 %prep
-%autosetup -p1 -n "%{name}-%{real_version}"
+%autosetup -p1
 
 
 %build
 %meson \
         -Dgcr=true \
-        -Ddisable-static=true \
         -Dvapi=false \
 %if %{with libnma_gtk4}
         -Dlibnma_gtk4=true
@@ -146,6 +143,9 @@ files to be used for integrating GUI tools with NetworkManager.
 
 
 %changelog
+* Fri Apr 8 2022 Ana Cabral <acabral@redhat.com> - 1.8.38-1
+- Rebase to 1.8.38
+
 * Fri Mar 25 2022 Ana Cabral <acabral@redhat.com> - 1.8.36-2
 - Rebuilt