From 35a2a71801f34e1add43103973871bc6089ae59c Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 25 Sep 2019 09:00:32 +0200 Subject: [PATCH] contrib/rpm: drop BuildRequires to deprecated "wireless-tools-devel" "wireless-tools-devel" is long depreacted and not used by NetworkManager, not even for WEXT. Drop it from the build dependencies. (cherry picked from commit 9fc449051390a99729b8611a1aa0fd0b7fb99e20) --- contrib/fedora/REQUIRED_PACKAGES | 1 - contrib/fedora/rpm/NetworkManager.spec | 5 ----- 2 files changed, 6 deletions(-) diff --git a/contrib/fedora/REQUIRED_PACKAGES b/contrib/fedora/REQUIRED_PACKAGES index 2ed13c5d69..fb6e173a56 100755 --- a/contrib/fedora/REQUIRED_PACKAGES +++ b/contrib/fedora/REQUIRED_PACKAGES @@ -83,7 +83,6 @@ install \ vala-devel \ vala-tools \ valgrind \ - wireless-tools-devel \ "${EXTRA_PACKAGES[@]}" # some packages don't exist in certain distributions. Install them one-by-one, and ignore errors. diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 4dd6cdad1d..2b44ef83f5 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -7,8 +7,6 @@ # Note that it contains __PLACEHOLDERS__ that will be replaced by the accompanying 'build.sh' script. -%global wireless_tools_version 1:28-0pre9 - %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) @@ -183,9 +181,6 @@ BuildRequires: intltool BuildRequires: gettext-devel BuildRequires: dbus-devel >= %{dbus_version} -%if 0%{?fedora} -BuildRequires: wireless-tools-devel >= %{wireless_tools_version} -%endif BuildRequires: glib2-devel >= 2.40.0 BuildRequires: gobject-introspection-devel >= 0.10.3 %if %{with ppp}