diff --git a/SPECS/NetworkManager.spec b/SPECS/NetworkManager.spec index a6075c6..2892679 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.90 -%global release_version 0.10 +%global real_version 1.30.0 +%global release_version 2 %global snapshot %{nil} %global git_sha %{nil} @@ -47,12 +47,8 @@ %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 @@ -175,7 +171,7 @@ Version: %{rpm_version} Release: %{release_version}%{?snap}%{?dist} Group: System Environment/Base License: GPLv2+ and LGPLv2+ -URL: http://www.gnome.org/projects/NetworkManager/ +URL: https://networkmanager.dev/ Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/%{name}-%{real_version}.tar.xz Source1: NetworkManager.conf @@ -190,7 +186,7 @@ Source6: 70-nm-connectivity.conf Patch1: 0001-cloud-setup-systemd-unit-rh1791758.patch # Bugfixes that are only relevant until next rebase of the package. -# Patch1000: some.patch +Patch1000: 1000-bond-avoid-logging-warning-to-set-ad_actor_system-00.patch # The pregenerated docs contain default values and paths that depend # on the configure options when creating the source tarball. @@ -1154,6 +1150,12 @@ fi %changelog +* Tue Feb 23 2021 Thomas Haller - 1:1.30.0-2 +- Avoid logging warning setting bond ad_actor_system (rh #1923999) + +* Thu Feb 18 2021 Thomas Haller - 1:1.30.0-1 +- Update to 1.30.0 release + * Thu Feb 11 2021 Thomas Haller - 1:1.30.0-0.10 - Update to 1.30-rc1 (1.29.90-dev) (development) - cloud-setup: fix removing IPv4 address (rh #1920838)