From 0f26f0983a1ca91be85c18e633a67bddad5721e6 Mon Sep 17 00:00:00 2001
From: Packit Service <user-cont-team+packit-service@redhat.com>
Date: Jan 16 2021 08:13:18 +0000
Subject: Add spec-file for the distribution


---

diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec
index be554ca..e6bfe7f 100644
--- a/SPECS/NetworkManager.spec
+++ b/SPECS/NetworkManager.spec
@@ -6,8 +6,8 @@
 
 %global epoch_version 1
 %global rpm_version 1.30.0
-%global real_version 1.29.7
-%global release_version 0.5
+%global real_version 1.29.8
+%global release_version 0.6
 %global snapshot %{nil}
 %global git_sha %{nil}
 
@@ -38,6 +38,22 @@
 
 ###############################################################################
 
+%if "x__BCOND_DEFAULT_DEBUG__" == "x1" || "x__BCOND_DEFAULT_DEBUG__" == "x0"
+%global bcond_default_debug __BCOND_DEFAULT_DEBUG__
+%else
+%global bcond_default_debug 0
+%endif
+
+%if "x__BCOND_DEFAULT_TEST__" == "x1" || "x__BCOND_DEFAULT_TEST__" == "x0"
+%global bcond_default_test __BCOND_DEFAULT_TEST__
+%else
+%if 0%{?rhel} >= 9
+%global bcond_default_test 1
+%else
+%global bcond_default_test 0
+%endif
+%endif
+
 %bcond_with meson
 %bcond_without adsl
 %bcond_without bluetooth
@@ -52,8 +68,16 @@
 # on RHEL we don't regenerate the documentation
 %bcond_with    regen_docs
 
+%if %{bcond_default_debug}
+%bcond_without debug
+%else
 %bcond_with    debug
+%endif
+%if %{bcond_default_test}
+%bcond_without test
+%else
 %bcond_with    test
+%endif
 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
 %bcond_without lto
 %else
@@ -167,6 +191,7 @@ Patch1: 0001-cloud-setup-systemd-unit-rh1791758.patch
 
 # Bugfixes that are only relevant until next rebase of the package.
 # Patch1000: some.patch
+Patch1000: 1000-initrd-accept-a-zero-byte-prefix-for-BOOTIF-rh1904099.patch
 
 # The pregenerated docs contain default values and paths that depend
 # on the configure options when creating the source tarball.
@@ -794,8 +819,7 @@ intltoolize --automake --copy --force
 	--with-resolvconf=no \
 	--with-netconfig=no \
 	--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
-	--with-config-logging-backend-default=%{logging_backend_default} \
-	--enable-json-validation
+	--with-config-logging-backend-default=%{logging_backend_default}
 
 make %{?_smp_mflags}
 
@@ -1114,10 +1138,18 @@ fi
 %{systemd_dir}/nm-cloud-setup.timer
 %{nmlibdir}/dispatcher.d/90-nm-cloud-setup.sh
 %{nmlibdir}/dispatcher.d/no-wait.d/90-nm-cloud-setup.sh
+%{_mandir}/man8/nm-cloud-setup.8*
 %endif
 
 
 %changelog
+* Thu Jan 14 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-0.6
+- Update to 1.29.8 (development)
+- initrd: accept zero-byte prefix for BOOTIF MAC address (rh #1904099)
+- core: fix bond port wrongly detached by dispather call (rh #1888348)
+- cloud-setup: add manual page (rh #1867997)
+- core: fix handling timeout for IPv6 RDNSS,DNSSL option in RA (rh #1874743)
+
 * Wed Dec 23 2020 Beniamino Galvani <bgalvani@redhat.com> - 1:1.30.0-0.5
 - Update to 1.29.7 (development)
 - Add WPA3-Enterprise support (rh #1883024)