From 27418b18511727179a1ebe7894eda49d21bf015c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 7 Mar 2019 10:46:48 +0100 Subject: [PATCH 1/5] Revert "contrib/rpm: remove Group tag for Fedora 30+" Group tag is not required, though is harmless. We could either remove it, or keep it, but there's absolutely no excuse for conditionalizing it. Let's keep it for now, because rpm -i still prints it. This reverts commit 1feeba6f1add8db5bf4a7cd41be76a47f44f844b. --- contrib/fedora/rpm/NetworkManager.spec | 40 -------------------------- 1 file changed, 40 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 016c68502..52ec8957d 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -103,12 +103,6 @@ %global dhcp_default internal %endif -%if 0%{?fedora} >= 30 -%global group_tag 0 -%else -%global group_tag 1 -%endif - ############################################################################### Name: NetworkManager @@ -116,9 +110,7 @@ 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/ @@ -252,9 +244,7 @@ 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 @@ -267,9 +257,7 @@ 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 @@ -284,9 +272,7 @@ 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} @@ -301,9 +287,7 @@ 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) @@ -325,9 +309,7 @@ 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} @@ -341,9 +323,7 @@ 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 @@ -357,9 +337,7 @@ 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} @@ -372,9 +350,7 @@ 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} @@ -387,9 +363,7 @@ 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 @@ -407,9 +381,7 @@ 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 @@ -420,9 +392,7 @@ 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 @@ -436,9 +406,7 @@ 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} @@ -451,9 +419,7 @@ 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} @@ -465,9 +431,7 @@ 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 @@ -483,9 +447,7 @@ 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} @@ -499,9 +461,7 @@ 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} From f8dde7014bb4e550024f2cf89b0dd75d93c0aee4 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 7 Mar 2019 10:38:45 +0100 Subject: [PATCH 2/5] Revert "contrib/rpm: require "vala" instead of "vala-tools" for Fedora 30+" This is just plain ugly. This reverts commit 0024485b5a2527fa0af699cf110d807c493b90f8. --- contrib/fedora/rpm/NetworkManager.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 52ec8957d..4c7b6ebab 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -178,11 +178,7 @@ 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 c10e61e21db6be7bd0c4ac8704f72bb2332a7595 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 7 Mar 2019 10:43:16 +0100 Subject: [PATCH 3/5] contrib/rpm: drag in vala tools by the binary The package's called either "vala" or "vala-tools". Sigh. --- contrib/fedora/rpm/NetworkManager.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 4c7b6ebab..d98a43bbf 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -178,7 +178,7 @@ BuildRequires: gtk-doc %endif BuildRequires: libudev-devel BuildRequires: libuuid-devel -BuildRequires: vala-tools +BuildRequires: /usr/bin/valac BuildRequires: iptables BuildRequires: libxslt %if %{with bluetooth} From 3326a87953934d0e7953d8de824044e9661e45c7 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 7 Mar 2019 10:44:59 +0100 Subject: [PATCH 4/5] Revert "contrib/rpm: use "%ldconfig_scriptlets" for Fedora 30+" This is utterly pointless. %ldconfig_scriptlets expand to an empty string on Fedora 28+. This reverts commit ad836541cb1cc67a484fad61e13b17c3c5643419. --- contrib/fedora/rpm/NetworkManager.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index d98a43bbf..617a70ed6 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -801,15 +801,11 @@ 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 a1e6afc0b213f8ec9e901b7c2b781f2d7f57bd41 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 7 Mar 2019 10:46:05 +0100 Subject: [PATCH 5/5] contrib/rpm: drop ldconfig scriptlets from Fedora 28+ In newer RPM file triggers in glibc package take care of this. While these scriptlets whould do no harm there, removing them yields a tiny theoretical performance improvement. --- contrib/fedora/rpm/NetworkManager.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 617a70ed6..e3293bb7c 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -801,11 +801,13 @@ fi %systemd_postun +%if 0%{?fedora} < 28 %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig %post libnm -p /sbin/ldconfig %postun libnm -p /sbin/ldconfig +%endif %files