Split the zenmap RPM subpackage into its own spec file.

nmap.spec.in

@@ -1,12 +1,6 @@
-# This spec file defines two packages. nmap is Nmap itself and zenmap is
-# the Zenmap frontend. Both packages are built by default. To keep from
-# building the zenmap package, add
-#     --define "buildzenmap 0"
-# to the rpmbuild command. To build a static RPM, add
+# To build a static RPM, add
 #     --define "static 1"
-# By default, Zenmap will be built using whatever version of Python is
-# the default on your system. To change this, use something like
-#     --define "__python /usr/bin/python2.5"
+# to the rpmbuild command line.
 
 %define name nmap
 %define version @VERSION@
@@ -41,25 +35,17 @@ devices are also supported, including the Sharp Zaurus and the iPAQ.
 %prep
 %setup -q
 
-%define makeflags %{?__python:PYTHON="%{__python}"}
-
 %build
-%if "%{buildzenmap}" != "0"
-%configure --without-openssl
-%else
 %configure --without-openssl --without-zenmap
-%endif
 %if "%{static}" == "1"
-make %{makeflags} static
+make static
 %else
-make %{makeflags}
+make
 %endif
 
 %install
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-make %{makeflags} install DESTDIR=$RPM_BUILD_ROOT
-# Don't package the uninstaller with the RPM.
-rm -f $RPM_BUILD_ROOT%{_bindir}/uninstall_zenmap
+make install DESTDIR=$RPM_BUILD_ROOT
 strip $RPM_BUILD_ROOT%{_bindir}/* || :
 gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
 
@@ -76,36 +62,11 @@ gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
 %{_datadir}/nmap
 %{_libexecdir}/nmap
 
-# zenmap subpackage.
-%if "%{buildzenmap}" != "0"
-%package -n zenmap
-Summary: Multi-platform graphical Nmap frontend and results viewer.
-Group: Applications/System
-# The python dependency is filled in automatically.
-Requires: nmap, gtk2
-# Zenmap should really have a BuildArch of "noarch" but the arch of a
-# subpackage can't be different from that of the rest of the spec.
-%description -n zenmap
-Zenmap is an Nmap frontend. It is meant to be useful for advanced users
-and to make Nmap easy to use by beginners. It was originally derived
-from Umit, an Nmap GUI created as part of the Google Summer of Code.
-
-# Find where Python modules are installed. See
-# http://fedoraproject.org/wiki/Packaging/Python.
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
-
-%files -n zenmap
-%defattr(-,root,root)
-%{_bindir}/zenmap
-# This gets the modules and the .egg-info file if it was installed.
-%{python_sitelib}/*
-%{_datadir}/icons/*
-%{_datadir}/pixmaps/*
-%{_datadir}/umit
-%endif
-
 %changelog
 
+* Thu Nov 08 2007 David Fifield (david(a)bamsoftware.com)
+- Split the zenmap subpackage into its own spec file.
+
 * Tue Nov 06 2007 David Fifield (david(a)bamsoftware.com)
 - Fix the Zenmap build on 64-bit architectures (where %{_libdir} is
   "/usr/lib64" but Python modules may not be installed there) and make