diff options
author | Thomas Haller <thaller@redhat.com> | 2019-04-09 13:44:41 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-04-09 15:41:21 +0200 |
commit | b3997312bf19b702aa4a977ac84af97cb95e3264 (patch) | |
tree | 7776cf8bac5c99c7ad116c8da8cfae2fbd44aa50 /contrib/fedora | |
parent | b1f556bae238afdb4bcea9821e429df00ec9f2ae (diff) | |
download | NetworkManager-b3997312bf19b702aa4a977ac84af97cb95e3264.tar.gz |
contrib/rpm: make spec file more similar to rhel-7's
Diffstat (limited to 'contrib/fedora')
-rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 73 |
1 files changed, 62 insertions, 11 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 7994d9fb58..dba5e66899 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -97,12 +97,34 @@ %global with_modem_manager_1 0 %endif -%if 0%{?fedora} >= 31 || 0%{?rhel} >= 8 +%if 0%{?fedora} >= 31 || 0%{?rhel} > 7 %global dhcp_default internal %else %global dhcp_default dhclient %endif +%if 0%{?fedora} || 0%{?rhel} > 7 +%global logging_backend_default journal +%global dns_rc_manager_default symlink +%else +%global logging_backend_default syslog +%global dns_rc_manager_default file +%endif + +%if 0%{?rhel} +%global config_plugins_default ifcfg-rh,ibft +%global ibft_enabled yes +%else +%global config_plugins_default ifcfg-rh +%global ibft_enabled no +%endif + +%if 0%{?fedora} +%global ebpf_enabled yes +%else +%global ebpf_enabled no +%endif + ############################################################################### Name: NetworkManager @@ -137,6 +159,11 @@ Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager < %{obsoletes_ppp_plugin} Obsoletes: NetworkManager-wimax < 1.2 +%if 0%{?rhel} && 0%{?rhel} <= 7 +# Kept for RHEL to ensure that wired 802.1x works out of the box +Requires: wpa_supplicant >= 1:1.1 +%endif + Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 Conflicts: NetworkManager-pptp < 1:0.7.0.99-1 @@ -256,7 +283,12 @@ Summary: Bluetooth device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: NetworkManager-wwan = %{epoch}:%{version}-%{release} +%if 0%{?rhel} && 0%{?rhel} <= 7 +# No Requires:bluez to prevent it being installed when updating +# to the split NM package +%else Requires: bluez >= 4.101-5 +%endif Obsoletes: NetworkManager < %{obsoletes_device_plugins} Obsoletes: NetworkManager-bt @@ -272,8 +304,12 @@ Group: System Environment/Base BuildRequires: teamd-devel Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Obsoletes: NetworkManager < %{obsoletes_device_plugins} +%if 0%{?fedora} || 0%{?rhel} >= 8 # Team was split from main NM binary between 0.9.10 and 1.0 +# We need this Obsoletes in addition to the one above +# (git:3aede801521ef7bff039e6e3f1b3c7b566b4338d). Obsoletes: NetworkManager < 1.0.0 +%endif %description team This package contains NetworkManager support for team devices. @@ -307,7 +343,12 @@ This package contains NetworkManager support for Wifi and OLPC devices. Summary: Mobile broadband device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} +%if 0%{?rhel} && 0%{?rhel} <= 7 +# No Requires:ModemManager to prevent it being installed when updating +# to the split NM package +%else Requires: ModemManager +%endif Obsoletes: NetworkManager < %{obsoletes_device_plugins} %description wwan @@ -546,10 +587,13 @@ by nm-connection-editor and nm-applet in a non-graphical environment. -Dconcheck=true \ %if 0%{?fedora} -Dlibpsl=true \ - -Debpf=true \ %else -Dlibpsl=false \ +%endif +%if %{ebpf_enabled} != yes -Debpf=false \ +%else + -Debpf=true \ %endif -Dsession_tracking=systemd \ -Dsuspend_resume=systemd \ @@ -559,14 +603,20 @@ by nm-connection-editor and nm-applet in a non-graphical environment. -Dtests=yes \ -Dvalgrind=no \ -Difcfg_rh=true \ +%if %{ibft_enabled} != yes + -Dibft=false \ +%else + -Dibft=true \ +%endif + -Difupdown=false \ %if %{with ppp} -Dpppd_plugin_dir=%{_libdir}/pppd/%{ppp_version} \ -Dppp=true \ %endif -Ddist_version=%{version}-%{release} \ - -Dconfig_plugins_default='ifcfg-rh' \ - -Dconfig_dns_rc_manager_default=symlink \ - -Dconfig_logging_backend_default=journal \ + -Dconfig_plugins_default=%{config_plugins_default} \ + -Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \ + -Dconfig_logging_backend_default=%{logging_backend_default} \ -Djson_validation=true \ %if %{with libnm_glib} -Dlibnm_glib=true @@ -662,11 +712,10 @@ intltoolize --automake --copy --force --enable-concheck \ %if 0%{?fedora} --with-libpsl \ - --with-ebpf \ %else --without-libpsl \ - --without-ebpf \ %endif + --with-ebpf=%{ebpf_enabled} \ --with-session-tracking=systemd \ --with-suspend-resume=systemd \ --with-systemdsystemunitdir=%{systemd_dir} \ @@ -680,14 +729,16 @@ intltoolize --automake --copy --force %endif --with-valgrind=no \ --enable-ifcfg-rh=yes \ + --enable-config-plugin-ibft=%{ibft_enabled} \ + --enable-ifupdown=no \ %if %{with ppp} --with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \ --enable-ppp=yes \ %endif --with-dist-version=%{version}-%{release} \ - --with-config-plugins-default='ifcfg-rh' \ - --with-config-dns-rc-manager-default=symlink \ - --with-config-logging-backend-default=journal \ + --with-config-plugins-default=%{config_plugins_default} \ + --with-config-dns-rc-manager-default=%{dns_rc_manager_default} \ + --with-config-logging-backend-default=%{logging_backend_default} \ --enable-json-validation \ %if %{with libnm_glib} --with-libnm-glib @@ -802,7 +853,7 @@ fi %systemd_postun -%if 0%{?fedora} < 28 +%if (0%{?fedora} && 0%{?fedora} < 28) || 0%{?rhel} %post glib -p /sbin/ldconfig %postun glib -p /sbin/ldconfig |