diff -r 4f133201e207 -r 4667f24fe848 nmap/nmap.spec
--- a/nmap/nmap.spec	Fri Mar 11 21:30:26 2011 +0100
+++ b/nmap/nmap.spec	Fri Mar 11 21:36:51 2011 +0100
@@ -1,35 +1,21 @@
-# To build a static RPM, add
-#     --define "static 1"
-# to the rpmbuild command line. To build without Ncat, add
-#     --define "buildncat 0"
-#
-# To specify openssl dir, add something like:
-#     --define "openssl /usr/local/ssl"
+Summary:       Network exploration tool and security scanner
+Vendor:        Europalab Software
+Packager:      Michael Schloh von Bennewitz
+Distribution:  MeeGo Thirdparty
+Name:          nmap
+Version:       5.21
+Release:       20101201
+URL:           http://www.nmap.org/
+Group:         Applications/System
+License:       http://nmap.org/man/man-legal.html
+Source0:       http://nmap.org/dist/%{name}-%{version}.tar.bz2
+BuildRoot:     %{_tmppath}/%{name}-root
+BuildRequires: openssl-devel libpcap-devel pcre-devel lua-devel
 
-%define name nmap
-%define version 5.21
-%define release 1
-%define _prefix /usr
-
-Summary: Network exploration tool and security scanner
-Name: %{name}
-Version: %{version}
-Release: %{release}
-Epoch: 2
-License: http://nmap.org/man/man-legal.html
-Group: Applications/System
-Source0: http://nmap.org/dist/%{name}-%{version}.tgz
-URL: http://nmap.org
-
-# For Ndiff.
-Requires: python >= 2.4
-
-# RPM can't be relocatable until I stop storing path info in the binary.
-# Prefix: %{_prefix}
-BuildRoot: %{_tmppath}/%{name}-root
+# for ndiff(1) only
+Requires:      python >= 2.4
 
 %description
-
 Nmap ("Network Mapper") is a free and open source utility
 for network exploration or security auditing. Many systems and network
 administrators also find it useful for tasks such as network
@@ -46,16 +32,12 @@
 %prep
 %setup -q
 
+# avoid using included copies of libraries
+rm -rf liblua libpcap libpcre macosx mswin32
+
 %build
-%configure --with-openssl=%{openssl} --without-zenmap --with-ndiff --with-libdnet=included --with-libpcap=included --with-libpcre=included --with-liblua=included
-%if "%{buildncat}" == "0"
-%configure --without-ncat
-%endif
-%if "%{static}" == "1"
-make static
-%else
-make
-%endif
+%configure --without-ncat --without-zenmap --with-ndiff --with-libdnet=included --with-openssl=/usr --with-libpcap=/usr --with-libpcre=/usr --with-liblua=/usr
+make %{?_smp_mflags}
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
@@ -79,31 +61,9 @@
 %{_bindir}/ndiff
 %doc %{_prefix}/share/man/man1/ndiff.1.gz
 
-# Ncat subpackage
-%if "%{buildncat}" != "0"
-%package -n ncat
-Summary: Nmap's Netcat replacement
-Group: Applications/System
-
-%description -n ncat
-Ncat is a feature packed networking utility which will read and
-write data across a network from the command line.  It uses both
-TCP and UDP for communication and is designed to be a reliable
-back-end tool to instantly provide network connectivity to other
-applications and users. Ncat will not only work with IPv4 and IPv6
-but provides the user with a virtually limitless number of potential
-uses.
-
-%files -n ncat
-%defattr(-,root,root)
-%doc %{_prefix}/share/man/man1/ncat.1.gz
-%{_bindir}/ncat
-%{_datadir}/ncat
-
-%endif
-
 %changelog
-
+* Wed Dec 1 2010 Michael Schloh von Bennewitz <michael@schloh.com> - 5.21-20101201
+- Repackage for MeeGo 1.1
 * Sat Jun 06 2009 Fyodor (fyodor(a)insecure.org)
 - Removed changelog entries as SVN is a more authoritative source. Execute:
 - svn log --username guest --password "" svn://svn.insecure.org/nmap/nmap.spec.in