From c23a1ff9b625e9635c2f2618b93f17610df07521 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 18 Jan 2021 13:09:21 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/NetworkManager.git#a6813af4b60b280e0a6bfbacc3888690cafe4d52 --- NetworkManager.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index ed9d2bd..7003ecf 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -7,7 +7,7 @@ %global epoch_version 1 %global rpm_version 1.30.0 %global real_version 1.29.8 -%global release_version 0.1 +%global release_version 0.2 %global snapshot %{nil} %global git_sha %{nil} @@ -369,6 +369,12 @@ Summary: Wifi plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +%if 0%{?fedora} >= 29 || 0%{?rhel} >= 9 +Requires: wireless-regdb +%else +Requires: crda +%endif + %if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7) Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd) Suggests: wpa_supplicant @@ -806,7 +812,7 @@ intltoolize --automake --copy --force --with-config-dns-rc-manager-default=%{dns_rc_manager_default} \ --with-config-logging-backend-default=%{logging_backend_default} -make %{?_smp_mflags} +%make_build %endif @@ -814,7 +820,7 @@ make %{?_smp_mflags} %if %{with meson} %meson_install %else -make install DESTDIR=%{buildroot} +%make_install %endif cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/ @@ -992,7 +998,8 @@ fi %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man7/nmcli-examples.7* -%{_mandir}/man8/* +%{_mandir}/man8/nm-initrd-generator.8.gz +%{_mandir}/man8/NetworkManager.8.gz %dir %{_localstatedir}/lib/NetworkManager %dir %{_sysconfdir}/sysconfig/network-scripts %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service @@ -1132,6 +1139,9 @@ fi %changelog +* Fri Jan 15 2021 Peter Robinson 1:1.30.0-0.2 +- Require wireless-regdb for wifi support so WiFi region is set + * Thu Jan 14 2021 Thomas Haller - 1:1.30.0-0.1 - update to 1.29.8-dev snapshot