Upgrade to 1.42.0 release

This commit is contained in:
Thomas Haller 2023-02-10 10:06:22 +01:00
parent 268730fdde
commit 9aa462c3d5
No known key found for this signature in database
GPG Key ID: 29C2366E4DFC5728
3 changed files with 28 additions and 4 deletions

1
.gitignore vendored
View File

@ -426,3 +426,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-1.41.8.tar.xz /NetworkManager-1.41.8.tar.xz
/NetworkManager-1.41.90.tar.xz /NetworkManager-1.41.90.tar.xz
/NetworkManager-1.41.91.tar.xz /NetworkManager-1.41.91.tar.xz
/NetworkManager-1.42.0.tar.xz

View File

@ -4,12 +4,13 @@
%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad)
%global epoch_version 1 %global epoch_version 1
%global real_version 1.41.91 %global real_version 1.42.0
%global rpm_version %{real_version} %global rpm_version %{real_version}
%global release_version 1 %global release_version 1
%global snapshot %{nil} %global snapshot %{nil}
%global git_sha %{nil} %global git_sha %{nil}
%global bcond_default_debug 0 %global bcond_default_debug 0
%global bcond_default_lto %{nil}
%global bcond_default_test 0 %global bcond_default_test 0
%global obsoletes_device_plugins 1:0.9.9.95-1 %global obsoletes_device_plugins 1:0.9.9.95-1
@ -60,11 +61,19 @@
%else %else
%bcond_with test %bcond_with test
%endif %endif
%if "%{?bcond_default_lto}" == ""
%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%bcond_without lto %bcond_without lto
%else %else
%bcond_with lto %bcond_with lto
%endif %endif
%else
%if %{bcond_default_lto}
%bcond_without lto
%else
%bcond_with lto
%endif
%endif
%bcond_with sanitizer %bcond_with sanitizer
%if 0%{?fedora} %if 0%{?fedora}
%bcond_without connectivity_fedora %bcond_without connectivity_fedora
@ -287,6 +296,10 @@ BuildRequires: python2
BuildRequires: pygobject3-base BuildRequires: pygobject3-base
BuildRequires: dbus-python BuildRequires: dbus-python
BuildRequires: pexpect BuildRequires: pexpect
%if 0%{?rhel} >= 7 && %{with meson}
BuildRequires: python36-dbus
BuildRequires: python36-gobject
%endif
%endif %endif
BuildRequires: libselinux-devel BuildRequires: libselinux-devel
BuildRequires: polkit-devel BuildRequires: polkit-devel
@ -670,6 +683,7 @@ Preferably use nmcli instead.
%else %else
-Ddocs=false \ -Ddocs=false \
%endif %endif
-Dqt=false \
%if %{with team} %if %{with team}
-Dteamdctl=true \ -Dteamdctl=true \
%else %else
@ -705,8 +719,11 @@ Preferably use nmcli instead.
-Difcfg_rh=true \ -Difcfg_rh=true \
-Difupdown=false \ -Difupdown=false \
%if %{with ppp} %if %{with ppp}
-Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \ -Dpppd_plugin_dir="%{_libdir}/pppd/%{ppp_version}" \
-Dpppd="%{_sbindir}/pppd" \
-Dppp=true \ -Dppp=true \
%else
-Dppp=false \
%endif %endif
%if %{with firewalld_zone} %if %{with firewalld_zone}
-Dfirewalld_zone=true \ -Dfirewalld_zone=true \
@ -847,8 +864,11 @@ autoreconf --install --force
--enable-ifcfg-rh=yes \ --enable-ifcfg-rh=yes \
--enable-ifupdown=no \ --enable-ifupdown=no \
%if %{with ppp} %if %{with ppp}
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
--enable-ppp=yes \ --enable-ppp=yes \
--with-pppd="%{_sbindir}/pppd" \
--with-pppd-plugin-dir="%{_libdir}/pppd/%{ppp_version}" \
%else
--enable-ppp=no \
%endif %endif
%if %{with firewalld_zone} %if %{with firewalld_zone}
--enable-firewalld-zone=yes \ --enable-firewalld-zone=yes \
@ -1225,6 +1245,9 @@ fi
%changelog %changelog
* 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 * Thu Jan 26 2023 Lubomir Rintel <lkundrak@v3.sk> - - 1:1.41.91-1
- Update to 1.41.91 release (release candidate) - Update to 1.41.91 release (release candidate)

View File

@ -1 +1 @@
SHA512 (NetworkManager-1.41.91.tar.xz) = 178b29e73c0490139dee9b07f36ed03e8970558613d6309f9e0de57b992cf2f0263b460a423d632ca99d6d0ff6cbc48442ce366a9bcbcba1d44cc2a571b3d550 SHA512 (NetworkManager-1.42.0.tar.xz) = d6c57f79e1de669537501855545d0861044f07780fde61cbb643a955e84a3ca4e417cfb1978c277a1bca9002778dafda5387c28da1b4a58f9f320adaa553210c