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
This commit is contained in:
parent
931fefc507
commit
c23a1ff9b6
@ -7,7 +7,7 @@
|
|||||||
%global epoch_version 1
|
%global epoch_version 1
|
||||||
%global rpm_version 1.30.0
|
%global rpm_version 1.30.0
|
||||||
%global real_version 1.29.8
|
%global real_version 1.29.8
|
||||||
%global release_version 0.1
|
%global release_version 0.2
|
||||||
%global snapshot %{nil}
|
%global snapshot %{nil}
|
||||||
%global git_sha %{nil}
|
%global git_sha %{nil}
|
||||||
|
|
||||||
@ -369,6 +369,12 @@ Summary: Wifi plugin for NetworkManager
|
|||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
|
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)
|
%if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7)
|
||||||
Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd)
|
Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd)
|
||||||
Suggests: wpa_supplicant
|
Suggests: wpa_supplicant
|
||||||
@ -806,7 +812,7 @@ intltoolize --automake --copy --force
|
|||||||
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
|
--with-config-dns-rc-manager-default=%{dns_rc_manager_default} \
|
||||||
--with-config-logging-backend-default=%{logging_backend_default}
|
--with-config-logging-backend-default=%{logging_backend_default}
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%make_build
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -814,7 +820,7 @@ make %{?_smp_mflags}
|
|||||||
%if %{with meson}
|
%if %{with meson}
|
||||||
%meson_install
|
%meson_install
|
||||||
%else
|
%else
|
||||||
make install DESTDIR=%{buildroot}
|
%make_install
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
|
cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
|
||||||
@ -992,7 +998,8 @@ fi
|
|||||||
%{_mandir}/man1/*
|
%{_mandir}/man1/*
|
||||||
%{_mandir}/man5/*
|
%{_mandir}/man5/*
|
||||||
%{_mandir}/man7/nmcli-examples.7*
|
%{_mandir}/man7/nmcli-examples.7*
|
||||||
%{_mandir}/man8/*
|
%{_mandir}/man8/nm-initrd-generator.8.gz
|
||||||
|
%{_mandir}/man8/NetworkManager.8.gz
|
||||||
%dir %{_localstatedir}/lib/NetworkManager
|
%dir %{_localstatedir}/lib/NetworkManager
|
||||||
%dir %{_sysconfdir}/sysconfig/network-scripts
|
%dir %{_sysconfdir}/sysconfig/network-scripts
|
||||||
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
||||||
@ -1132,6 +1139,9 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jan 15 2021 Peter Robinson <pbrobinson@fedoraproject.org> 1:1.30.0-0.2
|
||||||
|
- Require wireless-regdb for wifi support so WiFi region is set
|
||||||
|
|
||||||
* Thu Jan 14 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-0.1
|
* Thu Jan 14 2021 Thomas Haller <thaller@redhat.com> - 1:1.30.0-0.1
|
||||||
- update to 1.29.8-dev snapshot
|
- update to 1.29.8-dev snapshot
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user