diff --git a/nmap.spec b/nmap.spec index 7d87f69..c305396 100644 --- a/nmap.spec +++ b/nmap.spec @@ -4,7 +4,7 @@ Name: nmap Epoch: 2 Version: 6.01 #global prerelease TEST5 -Release: 6%{?dist} +Release: 7%{?dist} # nmap is GPLv2 # zenmap is GPLv2 and LGPLv2+ (zenmap/higwidgets) and GPLv2+ (zenmap/radialnet) # libdnet-stripped is BSD (advertising clause rescinded by the Univ. of California in 1999) with some parts as Public Domain (crc32) @@ -21,7 +21,6 @@ Source3: zenmap-root.consoleapps # TEMPORARY - obsoleting nc caused troubles for libvirt, because ncat does not support # unix sockets, use wrapper with socat failback when unix sockets are required Source4: nc -Requires: socat #prevent possible race condition for shtool, rhbz#158996 Patch1: nmap-4.03-mktemp.patch @@ -72,6 +71,7 @@ Group: Applications/System Summary: Nmap's Netcat replacement Obsoletes: nc < 1.109.20120711-2 Provides: nc +Requires: socat %description ncat Ncat is a feature packed networking utility which will read and write data across a network from the command line. It uses both @@ -216,6 +216,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xnmap.1.gz %changelog +* Tue Oct 02 2012 Petr Ĺ abata - 2:6.01-7 +- Move the socat dependency to the ncat subpackage (#858733) + * Wed Sep 19 2012 Michal Hlavinka - 2:6.01-6 - shutdown socket on EOF (#845075)