From e83c290128ad057b016a8ead0de5a84b1b592803 Mon Sep 17 00:00:00 2001
From: Lubomir Rintel <lkundrak@v3.sk>
Date: Thu, 30 Jun 2022 16:49:53 +0200
Subject: [PATCH] Update to 1.39.8 release (development)

---
 .gitignore          |  1 +
 NetworkManager.spec | 19 ++++++++++---------
 sources             |  2 +-
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 91f9bf3..bd15f46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -413,3 +413,4 @@ network-manager-applet-0.8.1.tar.bz2
 /NetworkManager-1.37.91.tar.xz
 /NetworkManager-1.37.92.tar.xz
 /NetworkManager-1.38.0.tar.xz
+/NetworkManager-1.39.8.tar.xz
diff --git a/NetworkManager.spec b/NetworkManager.spec
index 63c4da2..35327cd 100644
--- a/NetworkManager.spec
+++ b/NetworkManager.spec
@@ -5,16 +5,16 @@
 %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
 
 %global epoch_version 1
-%global real_version 1.38.0
+%global real_version 1.39.8
 %global rpm_version %{real_version}
-%global release_version 2
+%global release_version 1
 %global snapshot %{nil}
 %global git_sha %{nil}
 
 %global obsoletes_device_plugins     1:0.9.9.95-1
 %global obsoletes_ppp_plugin         1:1.5.3
 %global obsoletes_initscripts_updown 1:1.36.0-0.6
-%global obsoletes_ifcfg_rh           1:1.36.2-1
+%global obsoletes_ifcfg_rh           1:1.36.2
 
 %global nmlibdir %{_prefix}/lib/%{name}
 %global nmplugindir %{_libdir}/%{name}/%{version}-%{release}
@@ -247,8 +247,7 @@ BuildRequires: meson
 BuildRequires: automake
 BuildRequires: autoconf
 %endif
-BuildRequires: intltool
-BuildRequires: gettext-devel
+BuildRequires: gettext-devel >= 0.19.8
 
 BuildRequires: dbus-devel >= %{dbus_version}
 BuildRequires: glib2-devel >= 2.40.0
@@ -739,7 +738,6 @@ Preferably use nmcli instead.
 gtkdocize
 %endif
 autoreconf --install --force
-intltoolize --automake --copy --force
 %configure \
 	--with-runstatedir=%{_rundir} \
 	--disable-silent-rules \
@@ -1085,9 +1083,6 @@ fi
 %if %{with firewalld_zone}
 %{_prefix}/lib/firewalld/zones/nm-shared.xml
 %endif
-%if 0%{?ifcfg_warning}
-%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
-%endif
 # systemd stuff
 %{_unitdir}/NetworkManager.service
 %{_unitdir}/NetworkManager-wait-online.service
@@ -1095,6 +1090,9 @@ fi
 %{_unitdir}/nm-priv-helper.service
 %dir %{_datadir}/doc/NetworkManager/examples
 %{_datadir}/doc/NetworkManager/examples/server.conf
+%if 0%{?ifcfg_warning}
+%{_sysconfdir}/sysconfig/network-scripts/readme-ifcfg-rh.txt
+%endif
 %doc NEWS AUTHORS README.md CONTRIBUTING.md
 %license COPYING
 %license COPYING.LGPL
@@ -1234,6 +1232,9 @@ fi
 
 
 %changelog
+* Thu Jun 30 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.39.8-1
+- Update to 1.39.8 release (development)
+
 * Mon May 30 2022 Ana Cabral <acabral@redhat.com> - 1:1.38.0-2
 - rpm: include an informational file in ifcfg files directory
 
diff --git a/sources b/sources
index 5e6b764..72a6c09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (NetworkManager-1.38.0.tar.xz) = 0f1532b4ea1aeb9d5dd922ee005eef325d39ba3526884793aaaed2eae61737f6a6e95644077f2b45ace569df79246d3d6404272cce02ca7e02b3632aee882940
+SHA512 (NetworkManager-1.39.8.tar.xz) = ce5e05a92e0dda2e72cb58d82b0f83891bb6cf21de1b8b45fa15c1d2b07aa96f575e774eae86a0b74b9f019347ef47aaf821d579be0d5382583005810af96ec7