From ace926e648326c19bef0120df01da90f4c800eb2 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Feb 2019 19:06:44 +0100 Subject: [PATCH 1/3] contrib/rpm: require "vala" instead of "vala-tools" for Fedora 30+ The "vala-tools" package was merged into "vala" [1]. While "vala" now "Provides: vala-tools", update the build requirements for Fedora 30 and newer. [1] https://src.fedoraproject.org/rpms/vala/c/82b21cc3026b8793744c51c34b7e2be7caec4aba https://src.fedoraproject.org/rpms/NetworkManager/c/f6c878a04ad4bbde6474e2f90b6c12c11b685967 (cherry picked from commit 0024485b5a2527fa0af699cf110d807c493b90f8) --- contrib/fedora/rpm/NetworkManager.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index a98bd52102..d48004d4e4 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -178,7 +178,11 @@ BuildRequires: gtk-doc %endif BuildRequires: libudev-devel BuildRequires: libuuid-devel +%if 0%{?fedora} >= 30 +BuildRequires: vala +%else BuildRequires: vala-tools +%endif BuildRequires: iptables BuildRequires: libxslt %if %{with bluetooth} From c110c1983e70fb703b4adbcd8847f92e88b71c81 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Feb 2019 19:11:56 +0100 Subject: [PATCH 2/3] contrib/rpm: use "%ldconfig_scriptlets" for Fedora 30+ https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets https://src.fedoraproject.org/rpms/NetworkManager/c/5c6421bc88bcfe4e6c9344d816d0156afb6055fc (cherry picked from commit ad836541cb1cc67a484fad61e13b17c3c5643419) --- contrib/fedora/rpm/NetworkManager.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index d48004d4e4..52ec8957dd 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -805,11 +805,15 @@ fi %systemd_postun +%if 0%{?fedora} >= 30 +%ldconfig_scriptlets glib +%ldconfig_scriptlets libnm +%else %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig - %post libnm -p /sbin/ldconfig %postun libnm -p /sbin/ldconfig +%endif %files From a227149bf283773554bee739f6bb985c4a3e28ae Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Tue, 26 Feb 2019 19:15:00 +0100 Subject: [PATCH 3/3] contrib/rpm: remove Group tag for Fedora 30+ https://fedoraproject.org/wiki/Changes/Remove_Group_Tag https://src.fedoraproject.org/rpms/NetworkManager/c/62adcbc888c62d8ab32531327e064fcc6581ca30 (cherry picked from commit 1feeba6f1add8db5bf4a7cd41be76a47f44f844b) --- contrib/fedora/rpm/NetworkManager.spec | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 52ec8957dd..016c685024 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -103,6 +103,12 @@ %global dhcp_default internal %endif +%if 0%{?fedora} >= 30 +%global group_tag 0 +%else +%global group_tag 1 +%endif + ############################################################################### Name: NetworkManager @@ -110,7 +116,9 @@ Summary: Network connection manager and user applications Epoch: %{epoch_version} Version: %{rpm_version} Release: %{release_version}%{?snap}%{?dist} +%if %{group_tag} Group: System Environment/Base +%endif License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager/ @@ -244,7 +252,9 @@ services. %if %{with adsl} %package adsl Summary: ADSL device plugin for NetworkManager +%if %{group_tag} Group: System Environment/Base +%endif Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager-atm @@ -257,7 +267,9 @@ This package contains NetworkManager support for ADSL devices. %if %{with bluetooth} %package bluetooth Summary: Bluetooth device plugin for NetworkManager +%if %{group_tag} Group: System Environment/Base +%endif Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release} Requires: bluez >= 4.101-5 @@ -272,7 +284,9 @@ This package contains NetworkManager support for Bluetooth devices. %if %{with team} %package team Summary: Team device plugin for NetworkManager +%if %{group_tag} Group: System Environment/Base +%endif BuildRequires: teamd-devel Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: NetworkManager < %{obsoletes_device_plugins} @@ -287,7 +301,9 @@ This package contains NetworkManager support for team devices. %if %{with wifi} %package wifi Summary: Wifi plugin for NetworkManager +%if %{group_tag} Group: System Environment/Base +%endif Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7) @@ -309,7 +325,9 @@ This package contains NetworkManager support for Wifi and OLPC devices. %if %{with wwan} %package wwan Summary: Mobile broadband device plugin for NetworkManager +%if %{group_tag} Group: System Environment/Base +%endif Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: ModemManager Obsoletes: NetworkManager < %{obsoletes_device_plugins} @@ -323,7 +341,9 @@ devices. %if %{with ovs} %package ovs Summary: Open vSwitch device plugin for NetworkManager +%if %{group_tag} Group: System Environment/Base +%endif Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} %if 0%{?rhel} == 0 Requires: openvswitch @@ -337,7 +357,9 @@ This package contains NetworkManager support for Open vSwitch bridges. %if %{with ppp} %package ppp Summary: PPP plugin for NetworkManager +%if %{group_tag} Group: System Environment/Base +%endif Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: ppp = %{ppp_version} Requires: NetworkManager = %{epoch}:%{version}-%{release} @@ -350,7 +372,9 @@ This package contains NetworkManager support for PPP. %package glib Summary: Libraries for adding NetworkManager support to applications (old API). +%if %{group_tag} Group: Development/Libraries +%endif Requires: dbus >= %{dbus_version} Requires: dbus-glib >= %{dbus_glib_version} Conflicts: NetworkManager-libnm < %{epoch}:%{version}-%{release} @@ -363,7 +387,9 @@ the older NetworkManager API. See also NetworkManager-libnm. %package glib-devel Summary: Header files for adding NetworkManager support to applications (old API). +%if %{group_tag} Group: Development/Libraries +%endif Requires: %{name}-glib%{?_isa} = %{epoch}:%{version}-%{release} Requires: glib2-devel Requires: pkgconfig @@ -381,7 +407,9 @@ This is the older NetworkManager API. See also NetworkManager-libnm-devel. %package libnm Summary: Libraries for adding NetworkManager support to applications (new API). +%if %{group_tag} Group: Development/Libraries +%endif Conflicts: NetworkManager-glib < %{epoch}:%{version}-%{release} %description libnm @@ -392,7 +420,9 @@ NetworkManager API. See also NetworkManager-glib. %package libnm-devel Summary: Header files for adding NetworkManager support to applications (new API). +%if %{group_tag} Group: Development/Libraries +%endif Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release} Requires: glib2-devel Requires: pkgconfig @@ -406,7 +436,9 @@ is the new NetworkManager API. See also NetworkManager-glib-devel. %if %{with connectivity_fedora} %package config-connectivity-fedora Summary: NetworkManager config file for connectivity checking via Fedora servers +%if %{group_tag} Group: System Environment/Base +%endif BuildArch: noarch Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release} @@ -419,7 +451,9 @@ via Fedora infrastructure. %if %{with connectivity_redhat} %package config-connectivity-redhat Summary: NetworkManager config file for connectivity checking via Red Hat servers +%if %{group_tag} Group: System Environment/Base +%endif BuildArch: noarch Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release} @@ -431,7 +465,9 @@ via Red Hat infrastructure. %package config-server Summary: NetworkManager config file for "server-like" defaults +%if %{group_tag} Group: System Environment/Base +%endif BuildArch: noarch %description config-server @@ -447,7 +483,9 @@ deployments. %package dispatcher-routing-rules Summary: NetworkManager dispatcher file for advanced routing rules +%if %{group_tag} Group: System Environment/Base +%endif BuildArch: noarch Provides: %{name}-config-routing-rules = %{epoch}:%{version}-%{release} Obsoletes: %{name}-config-routing-rules < %{epoch}:%{version}-%{release} @@ -461,7 +499,9 @@ configurations using "/etc/sysconfig/network-scripts/rule-NAME" files %if 0%{with_nmtui} %package tui Summary: NetworkManager curses-based UI +%if %{group_tag} Group: System Environment/Base +%endif Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name}-libnm%{?_isa} = %{epoch}:%{version}-%{release}