rpms/nmap/F-12 nmap.spec,1.58,1.59

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/extras/rpms/nmap/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15069

Modified Files:
	nmap.spec 
Log Message:
spec cleanup



Index: nmap.spec
===================================================================
RCS file: /cvs/extras/rpms/nmap/F-12/nmap.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- nmap.spec	21 Aug 2009 14:42:37 -0000	1.58
+++ nmap.spec	30 Oct 2009 18:07:53 -0000	1.59
@@ -1,3 +1,5 @@
+%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 5.00
@@ -26,7 +28,6 @@ BuildRequires: openssl-devel, gtk2-devel
 BuildRequires: desktop-file-utils
 
 %define pixmap_srcdir zenmap/share/pixmaps
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
 Nmap is a utility for network exploration or security auditing.  It supports
@@ -37,13 +38,13 @@ and port specification, decoy scanning, 
 predictability characteristics, reverse-identd scanning, and more.
 
 %package frontend
-Summary: the GTK+ frontend for nmap
+Summary: The GTK+ front-end for nmap
 Group: Applications/System
 Requires: nmap = %{epoch}:%{version} gtk2 python >= 2.5 pygtk2 python-sqlite2 usermode
-BuildRequires: python >= 2.5 pygtk2-devel libpng-devel
+BuildRequires: python >= 2.5 python-devel pygtk2-devel libpng-devel
 %description frontend
-This package includes zenmap, a GTK+ frontend for nmap. The nmap package must
-be installed before installing nmap-frontend.
+This package includes zenmap, a GTK+ front-end for nmap. The nmap package must
+be installed before installing nmap front-end.
 
 %prep
 %setup -q
@@ -68,7 +69,7 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/uninstal
 #use consolehelper
 rm -f $RPM_BUILD_ROOT%{_datadir}/applications/zenmap*.desktop
 rm -f $RPM_BUILD_ROOT%{_datadir}/zenmap/su-to-zenmap.sh
-ln -s /usr/bin/consolehelper $RPM_BUILD_ROOT%{_bindir}/zenmap-root
+ln -s consolehelper $RPM_BUILD_ROOT%{_bindir}/zenmap-root
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d \
 	$RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/zenmap-root
@@ -88,7 +89,10 @@ desktop-file-install --vendor nmap \
 
 #for .desktop and app icon
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
-ln -s %{_datadir}/zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+ln -s ../../../../zenmap/pixmaps/zenmap.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
+
+#mv $RPM_BUILD_ROOT%{_datadir}/zenmap/locale/ $RPM_BUILD_ROOT%{_datadir}
+#%find_lang zenmap
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -107,10 +111,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/nmap
 %{_datadir}/ncat
 
-%files frontend
+%files frontend -f zenmap.lang
 %defattr(-,root,root)
-%config %{_sysconfdir}/pam.d/zenmap-root
-%config %{_sysconfdir}/security/console.apps/zenmap-root
+%config(noreplace) %{_sysconfdir}/pam.d/zenmap-root
+%config(noreplace) %{_sysconfdir}/security/console.apps/zenmap-root
 %{_bindir}/zenmap-root
 %{_bindir}/zenmap
 %{_bindir}/nmapfe