rpms/nmap/devel nmap.spec,1.63,1.64

[Michal Hlavinka]

Author: mhlavink

Update of /cvs/pkgs/rpms/nmap/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31745

Modified Files:
	nmap.spec 
Log Message:
* Fri Jun 18 2010 Michal Hlavinka <mhlavink at redhat.com> - 2:5.21-2
- fix multilib issue



Index: nmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -p -r1.63 -r1.64
--- nmap.spec	30 Apr 2010 11:26:48 -0000	1.63
+++ nmap.spec	18 Jun 2010 18:43:17 -0000	1.64
@@ -1,6 +1,4 @@
 #TODO: stop using local copy of libdnet, once system distributed version supports sctp (grep sctp /usr/include/dnet.h)
-%{!?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.21
@@ -60,6 +58,9 @@ be installed before installing nmap fron
 #be sure we're not using tarballed copies of some libraries
 rm -rf liblua libpcap libpcre macosx mswin32
 
+#fix multilib issue - step 1 - keep Paths.py time
+touch -r zenmap/zenmapCore/Paths.py Pathspytimeref
+
 #fix locale dir
 mv zenmap/share/zenmap/locale zenmap/share
 sed -i -e "s|^locale_dir =.*$|locale_dir = os.path.join('share','locale')|" \
@@ -88,6 +89,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/p
 install -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/zenmap-root
 install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/security/console.apps/zenmap-root
 
+#fix multilib issue - step 2 - restore Paths.py time
+touch -r Pathspytimeref $RPM_BUILD_ROOT%{python_sitelib}/zenmapCore/Paths.py
+
 cp docs/zenmap.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 gzip $RPM_BUILD_ROOT%{_mandir}/man1/* || :
 pushd $RPM_BUILD_ROOT%{_mandir}/man1
@@ -151,6 +155,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Fri Jun 18 2010 Michal Hlavinka <mhlavink at redhat.com> - 2:5.21-2
+- fix multilib issue
+
 * Fri Apr 30 2010 Ville Skyttä <ville.skytta at iki.fi> - 2:5.21-2
 - Mark localized man pages with %%lang.