rpms/NetworkManager
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Upstream sync (cosmetic improvements)

Browse Source 
Related: #2077392
This commit is contained in:
Ana Cabral 2022-08-18 17:31:47 +02:00
parent 2a0fd536f7
commit c506e3f5d3
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
NetworkManager.spec
View File

@ -71,12 +71,12 @@
%else %else
%bcond_with connectivity_fedora %bcond_with connectivity_fedora
%endif %endif
%if 0%{?rhel} && 0%{?rhel} > 7 %if 0%{?rhel} && 0%{?rhel} >= 8
%bcond_without connectivity_redhat %bcond_without connectivity_redhat
%else %else
%bcond_with connectivity_redhat %bcond_with connectivity_redhat
%endif %endif
%if 0%{?fedora} > 28 || 0%{?rhel} > 7 %if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
%bcond_without crypto_gnutls %bcond_without crypto_gnutls
%else %else
%bcond_with crypto_gnutls %bcond_with crypto_gnutls
@ -86,7 +86,7 @@
%else %else
%bcond_without iwd %bcond_without iwd
%endif %endif
%if 0%{?fedora} > 31 || 0%{?rhel} > 7 %if 0%{?fedora} >= 32 || 0%{?rhel} >= 8
%bcond_without firewalld_zone %bcond_without firewalld_zone
%else %else
%bcond_with firewalld_zone %bcond_with firewalld_zone
@ -94,7 +94,7 @@
############################################################################### ###############################################################################
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} >= 8
%global dbus_version 1.9.18 %global dbus_version 1.9.18
%global dbus_sys_dir %{_datadir}/dbus-1/system.d %global dbus_sys_dir %{_datadir}/dbus-1/system.d
%else %else
@ -116,15 +116,15 @@
%global with_modem_manager_1 0 %global with_modem_manager_1 0
%endif %endif
%if 0%{?fedora} >= 31 || 0%{?rhel} > 7 %if 0%{?fedora} >= 31 || 0%{?rhel} >= 8
%global dhcp_default internal %global dhcp_default internal
%else %else
%global dhcp_default dhclient %global dhcp_default dhclient
%endif %endif
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} >= 8
%global logging_backend_default journal %global logging_backend_default journal
%if 0%{?fedora} || 0%{?rhel} > 8 %if 0%{?fedora} || 0%{?rhel} >= 9
%global dns_rc_manager_default auto %global dns_rc_manager_default auto
%else %else
%global dns_rc_manager_default symlink %global dns_rc_manager_default symlink
@ -134,19 +134,19 @@
%global dns_rc_manager_default file %global dns_rc_manager_default file
%endif %endif
%if 0%{?rhel} > 8 || 0%{?fedora} > 32 %if 0%{?fedora} >= 33 || 0%{?rhel} >= 9
%global config_plugins_default_ifcfg_rh 0 %global config_plugins_default_ifcfg_rh 0
%else %else
%global config_plugins_default_ifcfg_rh 1 %global config_plugins_default_ifcfg_rh 1
%endif %endif
%if 0%{?rhel} > 9 || 0%{?fedora} > 35 %if 0%{?fedora} >= 36 || 0%{?rhel} >= 10
%global split_ifcfg_rh 1 %global split_ifcfg_rh 1
%else %else
%global split_ifcfg_rh 0 %global split_ifcfg_rh 0
%endif %endif
%if 0%{?rhel} > 8 || 0%{?fedora} > 35 %if 0%{?fedora} >= 36 || 0%{?rhel} >= 9
%global ifcfg_warning 1 %global ifcfg_warning 1
%else %else
%global ifcfg_warning 0 %global ifcfg_warning 0
@ -196,7 +196,7 @@ Source7: readme-ifcfg-rh.txt
# Patch1001: 1001-some.patch # Patch1001: 1001-some.patch
Requires(post): systemd Requires(post): systemd
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} >= 8
Requires(post): systemd-udev Requires(post): systemd-udev
%endif %endif
Requires(post): /usr/sbin/update-alternatives Requires(post): /usr/sbin/update-alternatives
@ -284,7 +284,7 @@ BuildRequires: mobile-broadband-provider-info-devel
BuildRequires: newt-devel BuildRequires: newt-devel
%endif %endif
BuildRequires: /usr/bin/dbus-launch BuildRequires: /usr/bin/dbus-launch
%if 0%{?fedora} > 27 || 0%{?rhel} > 7 %if 0%{?fedora} >= 28 || 0%{?rhel} >= 8
BuildRequires: python3 BuildRequires: python3
BuildRequires: python3-gobject-base BuildRequires: python3-gobject-base
BuildRequires: python3-dbus BuildRequires: python3-dbus
@ -308,7 +308,7 @@ BuildRequires: libubsan
BuildRequires: firewalld-filesystem BuildRequires: firewalld-filesystem
%endif %endif
BuildRequires: iproute BuildRequires: iproute
%if 0%{?fedora} || 0%{?rhel} > 7 %if 0%{?fedora} || 0%{?rhel} >= 8
BuildRequires: iproute-tc BuildRequires: iproute-tc
%endif %endif
@ -397,7 +397,7 @@ Requires: wireless-regdb
Requires: crda Requires: crda
%endif %endif
%if %{with iwd} && (0%{?fedora} > 24 || 0%{?rhel} > 7) %if %{with iwd} && (0%{?fedora} >= 25 || 0%{?rhel} >= 8)
Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd) Requires: (wpa_supplicant >= %{wpa_supplicant_version} or iwd)
Suggests: wpa_supplicant Suggests: wpa_supplicant
%else %else
@ -737,8 +737,8 @@ gtkdocize
autoreconf --install --force autoreconf --install --force
%configure \ %configure \
--with-runstatedir=%{_rundir} \ --with-runstatedir=%{_rundir} \
--disable-silent-rules \ --enable-silent-rules=no \
--disable-static \ --enable-static=no \
--with-nft=/usr/sbin/nft \ --with-nft=/usr/sbin/nft \
--with-iptables=/usr/sbin/iptables \ --with-iptables=/usr/sbin/iptables \
--with-dhclient=yes \ --with-dhclient=yes \
@ -753,26 +753,26 @@ autoreconf --install --force
%if %{with sanitizer} %if %{with sanitizer}
--with-address-sanitizer=exec \ --with-address-sanitizer=exec \
%if 0%{?fedora} || 0%{?rhel} >= 8 %if 0%{?fedora} || 0%{?rhel} >= 8
--enable-undefined-sanitizer \ --enable-undefined-sanitizer=yes \
%else %else
--disable-undefined-sanitizer \ --enable-undefined-sanitizer=no \
%endif %endif
%else %else
--with-address-sanitizer=no \ --with-address-sanitizer=no \
--disable-undefined-sanitizer \ --enable-undefined-sanitizer=no \
%endif %endif
%if %{with debug} %if %{with debug}
--enable-more-logging \ --enable-more-logging=yes \
--with-more-asserts=10000 \ --with-more-asserts=10000 \
%else %else
--disable-more-logging \ --enable-more-logging=no \
--without-more-asserts \ --with-more-asserts=0 \
%endif %endif
--enable-ld-gc \ --enable-ld-gc=yes \
%if %{with lto} %if %{with lto}
--enable-lto \ --enable-lto=yes \
%else %else
--disable-lto \ --enable-lto=no \
%endif %endif
--with-libaudit=yes-disabled-by-default \ --with-libaudit=yes-disabled-by-default \
%if 0%{?with_modem_manager_1} %if 0%{?with_modem_manager_1}
@ -811,11 +811,11 @@ autoreconf --install --force
--with-nm-cloud-setup=no \ --with-nm-cloud-setup=no \
%endif %endif
--enable-vala=yes \ --enable-vala=yes \
--enable-introspection \ --enable-introspection=yes \
%if %{with regen_docs} %if %{with regen_docs}
--enable-gtk-doc \ --enable-gtk-doc=yes \
%else %else
--disable-gtk-doc \ --enable-gtk-doc=no \
%endif %endif
%if %{with team} %if %{with team}
--enable-teamdctl=yes \ --enable-teamdctl=yes \
@ -830,11 +830,11 @@ autoreconf --install --force
--with-selinux=yes \ --with-selinux=yes \
--enable-polkit=yes \ --enable-polkit=yes \
--enable-modify-system=yes \ --enable-modify-system=yes \
--enable-concheck \ --enable-concheck=yes \
%if 0%{?fedora} %if 0%{?fedora}
--with-libpsl \ --with-libpsl=yes \
%else %else
--without-libpsl \ --with-libpsl=no \
%endif %endif
--with-ebpf=%{ebpf_enabled} \ --with-ebpf=%{ebpf_enabled} \
--with-session-tracking=systemd \ --with-session-tracking=systemd \
@ -855,9 +855,9 @@ autoreconf --install --force
--enable-ppp=yes \ --enable-ppp=yes \
%endif %endif
%if %{with firewalld_zone} %if %{with firewalld_zone}
--enable-firewalld-zone \ --enable-firewalld-zone=yes \
%else %else
--disable-firewalld-zone \ --enable-firewalld-zone=no \
%endif %endif
--with-dist-version=%{version}-%{release} \ --with-dist-version=%{version}-%{release} \
%if %{?config_plugins_default_ifcfg_rh} %if %{?config_plugins_default_ifcfg_rh}