From 63409b77878546bcb7c9141f4ad3fad4ea2f1ec4 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Thu, 20 Aug 2020 11:31:49 +0200 Subject: [PATCH] Drop libssh2 requirements for eln. Unbundle zlib --- nmap.spec | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nmap.spec b/nmap.spec index 2e2eab4..2176eee 100644 --- a/nmap.spec +++ b/nmap.spec @@ -7,7 +7,7 @@ Name: nmap Epoch: 2 Version: 7.80 #global prerelease TEST5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Network exploration tool and security scanner URL: http://nmap.org/ # Uses combination of licenses based on GPL license, but with extra modification @@ -33,11 +33,14 @@ BuildRequires: autoconf BuildRequires: gcc-c++ BuildRequires: gettext-devel BuildRequires: libpcap-devel +%if 0%{?fedora} BuildRequires: libssh2-devel +%endif BuildRequires: libtool BuildRequires: lua-devel BuildRequires: openssl-devel BuildRequires: pcre-devel +BuildRequires: zlib-devel Requires: %{name}-ncat = %{epoch}:%{version}-%{release} Obsoletes: nmap-frontend @@ -87,7 +90,12 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" ### TODO ## configure --with-libpcap=/usr ###TODO### %configure --with-libpcap=yes --with-liblua=included \ --without-zenmap --without-ndiff \ - --enable-dbus --with-libssh2=yes +%if 0%{?fedora} + --with-libssh2=yes \ +%else + --with-libssh2=no \ +%endif + --enable-dbus %make_build @@ -127,6 +135,9 @@ ln -s ncat %{buildroot}%{_bindir}/nc %{_mandir}/man1/ncat.1.gz %changelog +* Thu Aug 20 2020 Pavel Zhukov - 2:7.80-6 +- Drop libssh from eln + * Tue Jul 28 2020 Fedora Release Engineering - 2:7.80-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild