Drop libssh2 requirements for eln. Unbundle zlib
This commit is contained in:
parent
aa104b3145
commit
63409b7787
15
nmap.spec
15
nmap.spec
@ -7,7 +7,7 @@ Name: nmap
|
|||||||
Epoch: 2
|
Epoch: 2
|
||||||
Version: 7.80
|
Version: 7.80
|
||||||
#global prerelease TEST5
|
#global prerelease TEST5
|
||||||
Release: 5%{?dist}
|
Release: 6%{?dist}
|
||||||
Summary: Network exploration tool and security scanner
|
Summary: Network exploration tool and security scanner
|
||||||
URL: http://nmap.org/
|
URL: http://nmap.org/
|
||||||
# Uses combination of licenses based on GPL license, but with extra modification
|
# Uses combination of licenses based on GPL license, but with extra modification
|
||||||
@ -33,11 +33,14 @@ BuildRequires: autoconf
|
|||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: gettext-devel
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: libpcap-devel
|
BuildRequires: libpcap-devel
|
||||||
|
%if 0%{?fedora}
|
||||||
BuildRequires: libssh2-devel
|
BuildRequires: libssh2-devel
|
||||||
|
%endif
|
||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: lua-devel
|
BuildRequires: lua-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: pcre-devel
|
BuildRequires: pcre-devel
|
||||||
|
BuildRequires: zlib-devel
|
||||||
Requires: %{name}-ncat = %{epoch}:%{version}-%{release}
|
Requires: %{name}-ncat = %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
Obsoletes: nmap-frontend
|
Obsoletes: nmap-frontend
|
||||||
@ -87,7 +90,12 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
|||||||
### TODO ## configure --with-libpcap=/usr ###TODO###
|
### TODO ## configure --with-libpcap=/usr ###TODO###
|
||||||
%configure --with-libpcap=yes --with-liblua=included \
|
%configure --with-libpcap=yes --with-liblua=included \
|
||||||
--without-zenmap --without-ndiff \
|
--without-zenmap --without-ndiff \
|
||||||
--enable-dbus --with-libssh2=yes
|
%if 0%{?fedora}
|
||||||
|
--with-libssh2=yes \
|
||||||
|
%else
|
||||||
|
--with-libssh2=no \
|
||||||
|
%endif
|
||||||
|
--enable-dbus
|
||||||
|
|
||||||
%make_build
|
%make_build
|
||||||
|
|
||||||
@ -127,6 +135,9 @@ ln -s ncat %{buildroot}%{_bindir}/nc
|
|||||||
%{_mandir}/man1/ncat.1.gz
|
%{_mandir}/man1/ncat.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 20 2020 Pavel Zhukov <pzhukov@redhat.com> - 2:7.80-6
|
||||||
|
- Drop libssh from eln
|
||||||
|
|
||||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.80-5
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:7.80-5
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user