SPECS: nmap.spec - added system-dnet patch, use system libdnet - u...

qboosh qboosh at pld-linux.org
Fri Mar 21 20:32:23 CET 2008


Author: qboosh                       Date: Fri Mar 21 19:32:23 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added system-dnet patch, use system libdnet
- updated URL

---- Files affected:
SPECS:
   nmap.spec (1.136 -> 1.137) 

---- Diffs:

================================================================
Index: SPECS/nmap.spec
diff -u SPECS/nmap.spec:1.136 SPECS/nmap.spec:1.137
--- SPECS/nmap.spec:1.136	Fri Mar 21 18:47:42 2008
+++ SPECS/nmap.spec	Fri Mar 21 20:32:18 2008
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 #
 # TODO:
-#	- use system libdnet
 #	- desktop file for zenmap
 #
 Summary:	Network exploration tool and security scanner
@@ -15,15 +14,17 @@
 Name:		nmap
 Version:	4.60
 Release:	1
-License:	GPL v2
+License:	GPL v2 clarified, with OpenSSL exception
 Group:		Networking
 Source0:	http://www.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
 # Source0-md5:	6201551054050c11182fd6dd91682cb1
 Patch0:		%{name}-am18.patch
 Patch1:		%{name}-system-lua.patch
-URL:		http://www.insecure.org/nmap/index.html
-BuildRequires:	autoconf
+Patch2:		%{name}-system-dnet.patch
+URL:		http://nmap.org/
+BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
+BuildRequires:	libdnet-devel
 BuildRequires:	libpcap-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtool
@@ -32,6 +33,7 @@
 BuildRequires:	pcre-devel
 BuildRequires:	python-devel >= 1:2.5
 BuildRequires:	rpm-pythonprov
+BuildRequires:	rpmbuild(macros) >= 1.167
 BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -110,6 +112,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 # should be libtool with added "libtool: @LIBTOOL_DEPS@" rule in fact
 # (but the latter would fail due to bug in libtool 2.2)
@@ -126,10 +129,11 @@
 	cd "$OLDPWD"
 done
 
-CXXFLAGS="%{rpmcflags} -fno-rtti -fno-exceptions" \
+CXXFLAGS="%{rpmcxxflags} -fno-rtti -fno-exceptions"
 CPPFLAGS="-I/usr/include/lua51"
 %configure \
 	LIBLUA_LIBS="-llua51" \
+	--with-libdnet \
 	--with-liblua
 
 %{__make}
@@ -191,6 +195,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.137  2008-03-21 19:32:18  qboosh
+- added system-dnet patch, use system libdnet
+- updated URL
+
 Revision 1.136  2008-03-21 17:47:42  qboosh
 - added system-lua patch, use system lua51
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/nmap.spec?r1=1.136&r2=1.137&f=u



More information about the pld-cvs-commit mailing list