|
|
|
|
@ -1,16 +1,16 @@
|
|
|
|
|
|
|
|
|
|
%global wpa_supplicant_version 1:1.1
|
|
|
|
|
|
|
|
|
|
%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
|
|
|
|
|
%global ppp_version %(pkg-config --modversion pppd 2>/dev/null || sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad)
|
|
|
|
|
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
|
|
|
|
|
|
|
|
|
|
%global epoch_version 1
|
|
|
|
|
%global real_version 1.40.0
|
|
|
|
|
%global real_version 1.43.6
|
|
|
|
|
%global rpm_version %{real_version}
|
|
|
|
|
%global release_version 1
|
|
|
|
|
%global snapshot %{nil}
|
|
|
|
|
%global git_sha %{nil}
|
|
|
|
|
%global bcond_default_debug 0
|
|
|
|
|
%global bcond_default_lto %{nil}
|
|
|
|
|
%global bcond_default_test 0
|
|
|
|
|
|
|
|
|
|
%global obsoletes_device_plugins 1:0.9.9.95-1
|
|
|
|
|
@ -61,11 +61,19 @@
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with test
|
|
|
|
|
%endif
|
|
|
|
|
%if "%{?bcond_default_lto}" == ""
|
|
|
|
|
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
|
|
|
|
|
%bcond_without lto
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with lto
|
|
|
|
|
%endif
|
|
|
|
|
%else
|
|
|
|
|
%if %{bcond_default_lto}
|
|
|
|
|
%bcond_without lto
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with lto
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
%bcond_with sanitizer
|
|
|
|
|
%if 0%{?fedora}
|
|
|
|
|
%bcond_without connectivity_fedora
|
|
|
|
|
@ -250,7 +258,6 @@ BuildRequires: gnutls-devel >= 2.12
|
|
|
|
|
%else
|
|
|
|
|
BuildRequires: nss-devel >= 3.11.7
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: dhclient
|
|
|
|
|
BuildRequires: readline-devel
|
|
|
|
|
BuildRequires: audit-libs-devel
|
|
|
|
|
%if %{with regen_docs}
|
|
|
|
|
@ -289,6 +296,10 @@ BuildRequires: python2
|
|
|
|
|
BuildRequires: pygobject3-base
|
|
|
|
|
BuildRequires: dbus-python
|
|
|
|
|
BuildRequires: pexpect
|
|
|
|
|
%if 0%{?rhel} >= 7 && %{with meson}
|
|
|
|
|
BuildRequires: python36-dbus
|
|
|
|
|
BuildRequires: python36-gobject
|
|
|
|
|
%endif
|
|
|
|
|
%endif
|
|
|
|
|
BuildRequires: libselinux-devel
|
|
|
|
|
BuildRequires: polkit-devel
|
|
|
|
|
@ -605,8 +616,9 @@ Preferably use nmcli instead.
|
|
|
|
|
%if %{with test}
|
|
|
|
|
--werror \
|
|
|
|
|
%endif
|
|
|
|
|
-Dnft=/usr/sbin/nft \
|
|
|
|
|
-Diptables=/usr/sbin/iptables \
|
|
|
|
|
-Dnft=%{_sbindir}/nft \
|
|
|
|
|
-Diptables=%{_sbindir}/iptables \
|
|
|
|
|
-Ddhclient=%{_sbindir}/dhclient \
|
|
|
|
|
-Ddhcpcanon=no \
|
|
|
|
|
-Ddhcpcd=no \
|
|
|
|
|
-Dconfig_dhcp_default=%{dhcp_default} \
|
|
|
|
|
@ -671,6 +683,7 @@ Preferably use nmcli instead.
|
|
|
|
|
%else
|
|
|
|
|
-Ddocs=false \
|
|
|
|
|
%endif
|
|
|
|
|
-Dqt=false \
|
|
|
|
|
%if %{with team}
|
|
|
|
|
-Dteamdctl=true \
|
|
|
|
|
%else
|
|
|
|
|
@ -698,6 +711,7 @@ Preferably use nmcli instead.
|
|
|
|
|
%endif
|
|
|
|
|
-Dsession_tracking=systemd \
|
|
|
|
|
-Dsuspend_resume=systemd \
|
|
|
|
|
-Dsystemdsystemunitdir=%{_unitdir} \
|
|
|
|
|
-Dsystem_ca_path=/etc/pki/tls/cert.pem \
|
|
|
|
|
-Ddbus_conf_dir=%{dbus_sys_dir} \
|
|
|
|
|
-Dtests=yes \
|
|
|
|
|
@ -705,8 +719,11 @@ Preferably use nmcli instead.
|
|
|
|
|
-Difcfg_rh=true \
|
|
|
|
|
-Difupdown=false \
|
|
|
|
|
%if %{with ppp}
|
|
|
|
|
-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
|
|
-Dppp=true \
|
|
|
|
|
-Dpppd="%{_sbindir}/pppd" \
|
|
|
|
|
-Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \
|
|
|
|
|
%else
|
|
|
|
|
-Dppp=false \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
-Dfirewalld_zone=true \
|
|
|
|
|
@ -734,9 +751,9 @@ autoreconf --install --force
|
|
|
|
|
--with-runstatedir=%{_rundir} \
|
|
|
|
|
--enable-silent-rules=no \
|
|
|
|
|
--enable-static=no \
|
|
|
|
|
--with-nft=/usr/sbin/nft \
|
|
|
|
|
--with-iptables=/usr/sbin/iptables \
|
|
|
|
|
--with-dhclient=yes \
|
|
|
|
|
--with-nft=%{_sbindir}/nft \
|
|
|
|
|
--with-iptables=%{_sbindir}/iptables \
|
|
|
|
|
--with-dhclient=%{_sbindir}/dhclient \
|
|
|
|
|
--with-dhcpcd=no \
|
|
|
|
|
--with-dhcpcanon=no \
|
|
|
|
|
--with-config-dhcp-default=%{dhcp_default} \
|
|
|
|
|
@ -834,6 +851,7 @@ autoreconf --install --force
|
|
|
|
|
--with-ebpf=%{ebpf_enabled} \
|
|
|
|
|
--with-session-tracking=systemd \
|
|
|
|
|
--with-suspend-resume=systemd \
|
|
|
|
|
--with-systemdsystemunitdir=%{_unitdir} \
|
|
|
|
|
--with-system-ca-path=/etc/pki/tls/cert.pem \
|
|
|
|
|
--with-dbus-sys-dir=%{dbus_sys_dir} \
|
|
|
|
|
--with-tests=yes \
|
|
|
|
|
@ -846,8 +864,11 @@ autoreconf --install --force
|
|
|
|
|
--enable-ifcfg-rh=yes \
|
|
|
|
|
--enable-ifupdown=no \
|
|
|
|
|
%if %{with ppp}
|
|
|
|
|
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
|
|
|
|
|
--enable-ppp=yes \
|
|
|
|
|
--with-pppd="%{_sbindir}/pppd" \
|
|
|
|
|
--with-pppd-plugin-dir="%{_libdir}/pppd/%{ppp_version}" \
|
|
|
|
|
%else
|
|
|
|
|
--enable-ppp=no \
|
|
|
|
|
%endif
|
|
|
|
|
%if %{with firewalld_zone}
|
|
|
|
|
--enable-firewalld-zone=yes \
|
|
|
|
|
@ -905,7 +926,7 @@ rm -f %{buildroot}%{nmplugindir}/*.la
|
|
|
|
|
# Ensure the documentation timestamps are constant to avoid multilib conflicts
|
|
|
|
|
find %{buildroot}%{_datadir}/gtk-doc -exec touch --reference configure.ac '{}' \+
|
|
|
|
|
|
|
|
|
|
%if 0%{?__debug_package}
|
|
|
|
|
%if 0%{?__debug_package} && ! 0%{?flatpak}
|
|
|
|
|
mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
|
|
|
|
|
cp valgrind.suppressions %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}
|
|
|
|
|
%endif
|
|
|
|
|
@ -1062,10 +1083,10 @@ fi
|
|
|
|
|
%{_mandir}/man1/*
|
|
|
|
|
%{_mandir}/man5/*
|
|
|
|
|
%{_mandir}/man7/nmcli-examples.7*
|
|
|
|
|
%{_mandir}/man8/nm-initrd-generator.8.gz
|
|
|
|
|
%{_mandir}/man8/NetworkManager.8.gz
|
|
|
|
|
%{_mandir}/man8/NetworkManager-dispatcher.8.gz
|
|
|
|
|
%{_mandir}/man8/NetworkManager-wait-online.service.8.gz
|
|
|
|
|
%{_mandir}/man8/nm-initrd-generator.8*
|
|
|
|
|
%{_mandir}/man8/NetworkManager.8*
|
|
|
|
|
%{_mandir}/man8/NetworkManager-dispatcher.8*
|
|
|
|
|
%{_mandir}/man8/NetworkManager-wait-online.service.8*
|
|
|
|
|
%dir %{_localstatedir}/lib/NetworkManager
|
|
|
|
|
%dir %{_sysconfdir}/sysconfig/network-scripts
|
|
|
|
|
%{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service
|
|
|
|
|
@ -1224,6 +1245,58 @@ fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Thu Apr 20 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.43.6-1
|
|
|
|
|
- Update to 1.43.6 release (development)
|
|
|
|
|
|
|
|
|
|
* Tue Apr 18 2023 Adam Williamson <awilliam@redhat.com> - 1:1.43.5-3
|
|
|
|
|
- Fix ppp version discovery
|
|
|
|
|
|
|
|
|
|
* Tue Apr 18 2023 Adam Williamson <awilliam@redhat.com> - 1:1.43.5-2
|
|
|
|
|
- Rebuild for ppp 2.5.0
|
|
|
|
|
|
|
|
|
|
* Wed Apr 5 2023 Lubomir Rintel <lkundrak@v3.sk> - 1:1.43.5-1
|
|
|
|
|
- Update to 1.43.5 release (development)
|
|
|
|
|
|
|
|
|
|
* Wed Mar 22 2023 Thomas Haller <thaller@redhat.com> - 1:1.43.4-1
|
|
|
|
|
- Update to 1.43.4 release (development)
|
|
|
|
|
|
|
|
|
|
* Wed Mar 8 2023 Lubomir Rintel <lkundrak@v3.sk> - 1:1.43.3-1
|
|
|
|
|
- Update to an early 1.44 snapshot
|
|
|
|
|
|
|
|
|
|
* Fri Feb 10 2023 Thomas Haller <thaller@redhat.com> - 1:1.42.0-1
|
|
|
|
|
- Upgrade to 1.42.0 release
|
|
|
|
|
|
|
|
|
|
* Thu Jan 26 2023 Lubomir Rintel <lkundrak@v3.sk> - 1:1.41.91-1
|
|
|
|
|
- Update to 1.41.91 release (release candidate)
|
|
|
|
|
|
|
|
|
|
* Fri Jan 20 2023 Fernando Fernandez Mancera <ffmancera@riseup.net> - 1:1.41.90-1
|
|
|
|
|
- Update to 1.42-rc1 (1.41.90) (release candidate)
|
|
|
|
|
- Upstream sync specfile
|
|
|
|
|
|
|
|
|
|
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1:1.41.8-1.1
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Jan 16 2023 Beniamino Galvani <bgalvani@redhat.com> - 1:1.41.8-1
|
|
|
|
|
- Update to 1.41.8 release (development)
|
|
|
|
|
|
|
|
|
|
* Thu Dec 15 2022 Lubomir Rintel <lkundrak@v3.sk> - 1:1.41.7-1
|
|
|
|
|
- Update to 1.41.7 release (development)
|
|
|
|
|
|
|
|
|
|
* Wed Nov 30 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.6-1
|
|
|
|
|
- Update to 1.41.6 release (development)
|
|
|
|
|
|
|
|
|
|
* Fri Nov 18 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.5-1
|
|
|
|
|
- Update to 1.41.5 release (development)
|
|
|
|
|
|
|
|
|
|
* Thu Nov 3 2022 Thomas Haller <thaller@redhat.com> - 1:1.41.4-2
|
|
|
|
|
- fix generating stable UUIDs for keyfile (gitlab#1130)
|
|
|
|
|
|
|
|
|
|
* Wed Nov 2 2022 Wen Liang <wenliang@redhat.com> - 1:1.41.4-1
|
|
|
|
|
- Upgrade to 1.41.4 release
|
|
|
|
|
|
|
|
|
|
* Tue Oct 18 2022 Beniamino Galvani <bgalvani@redhat.com> - 1:1.41.3-1
|
|
|
|
|
- Upgrade to 1.41.3 release
|
|
|
|
|
|
|
|
|
|
* Fri Aug 26 2022 Thomas Haller <thaller@redhat.com> - 1:1.40.0-1
|
|
|
|
|
- Upgrade to 1.40.0 release
|
|
|
|
|
|
|
|
|
|
|
Beniamino Galvani
Adam Williamson
Kevin Fenzi
Lubomir Rintel
Thomas Haller
Yaakov Selkowitz
Fernando Fernandez Mancera
Fedora Release Engineering
Wen Liang