fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 08:28:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/rpm: use gnutls crypto library instead of NSS on rhel-8 and fedora-29

Browse source 
https://bugzilla.redhat.com/show_bug.cgi?id=1581693
This commit is contained in:
Thomas Haller 2018-05-23 14:30:47 +02:00
parent db99b6bba7
commit ebd61e1bc1
2 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/fedora/REQUIRED_PACKAGES
View file

@ -23,6 +23,7 @@ yum install \
dhclient \ dhclient \
gettext-devel \ gettext-devel \
git \ git \
gnutls-devel \
gobject-introspection-devel \ gobject-introspection-devel \
gtk-doc \ gtk-doc \
intltool \ intltool \

13
contrib/fedora/rpm/NetworkManager.spec
View file

@ -74,6 +74,11 @@
%else %else
%bcond_with connectivity_fedora %bcond_with connectivity_fedora
%endif %endif
%if 0%{?fedora} > 28 || 0%{?rhel} > 7
%bcond_without crypto_gnutls
%else
%bcond_with crypto_gnutls
%endif
############################################################################### ###############################################################################
@ -141,7 +146,11 @@ BuildRequires: automake autoconf intltool libtool
%if %{with ppp} %if %{with ppp}
BuildRequires: ppp-devel >= 2.4.5 BuildRequires: ppp-devel >= 2.4.5
%endif %endif
%if %{with crypto_gnutls}
BuildRequires: gnutls-devel >= 2.12
%else
BuildRequires: nss-devel >= 3.11.7 BuildRequires: nss-devel >= 3.11.7
%endif
BuildRequires: dhclient BuildRequires: dhclient
BuildRequires: readline-devel BuildRequires: readline-devel
BuildRequires: audit-libs-devel BuildRequires: audit-libs-devel
@ -419,7 +428,11 @@ intltoolize --automake --copy --force
--with-dhcpcd=no \ --with-dhcpcd=no \
--with-dhcpcanon=no \ --with-dhcpcanon=no \
--with-config-dhcp-default=dhclient \ --with-config-dhcp-default=dhclient \
%if %{with crypto_gnutls}
--with-crypto=gnutls \
%else
--with-crypto=nss \ --with-crypto=nss \
%endif
%if %{with sanitizer} %if %{with sanitizer}
--with-address-sanitizer=exec \ --with-address-sanitizer=exec \
%if 0%{?fedora} %if 0%{?fedora}