diff --git a/.gitignore b/.gitignore index 746c3c9..b78f235 100644 --- a/.gitignore +++ b/.gitignore @@ -376,3 +376,4 @@ network-manager-applet-0.8.1.tar.bz2 /NetworkManager-1.24.2.tar.xz /NetworkManager-1.25.90.tar.xz /NetworkManager-1.26.0.tar.xz +/NetworkManager-1.26.2.tar.xz diff --git a/NetworkManager.spec b/NetworkManager.spec index 28f8bb5..cfeb017 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -5,9 +5,9 @@ %global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global epoch_version 1 -%global rpm_version 1.26.0 -%global real_version 1.26.0 -%global release_version 2 +%global rpm_version 1.26.2 +%global real_version 1.26.2 +%global release_version 1 %global snapshot %{nil} %global git_sha %{nil} @@ -51,7 +51,11 @@ %bcond_without regen_docs %bcond_with debug %bcond_with test +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%bcond_without lto +%else %bcond_with lto +%endif %bcond_with sanitizer %if 0%{?fedora} %bcond_without connectivity_fedora @@ -126,6 +130,11 @@ %global ebpf_enabled "no" %endif +# Fedora 33 enables LTO by default by setting CFLAGS="-flto -ffat-lto-objects". +# However, we also require "-flto -flto-partition=none", so disable Fedora's +# default and use our configure option --with-lto instead. +%define _lto_cflags %{nil} + ############################################################################### Name: NetworkManager @@ -1086,6 +1095,10 @@ fi %changelog +* Wed Aug 19 2020 Thomas Haller - 1:1.26.2-1 +- update to 1.26.2 +- enable link time optimization (LTO). + * Mon Jul 27 2020 Fedora Release Engineering - 1:1.26.0-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index a3f6f98..312e27a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (NetworkManager-1.26.0.tar.xz) = 46035fda8f154497ba4a634e4bf7f0a11f579d0d3f4ffdcea7d47ea0bde6dd0183885491f5453255af7b163ae3db4f0c62c3161913a8c30c35b6475887235b6d +SHA512 (NetworkManager-1.26.2.tar.xz) = 4029bf5224523d851a36766376813c7edc85c2fef3600ceaffc0c7e6faadcfebf843a406ee071bdc59c21bceb7bf3de8c87fca6bb2f2116d9eddbb70e11bf517