rpms/nmap/devel nmap-4.68-nostrip.patch, NONE, 1.1 .cvsignore, 1.21, 1.22 nmap.spec, 1.44, 1.45 sources, 1.21, 1.22 nmap-4.60-nostrip.patch, 1.1, NONE

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/nmap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19421

Modified Files:
	.cvsignore nmap.spec sources 
Added Files:
	nmap-4.68-nostrip.patch 
Removed Files:
	nmap-4.60-nostrip.patch 
Log Message:
* Thu Jul 24 2008 Tomas Smetana <tsmetana at redhat.com> - 2:4.68-1
- new upstream version


nmap-4.68-nostrip.patch:

--- NEW FILE nmap-4.68-nostrip.patch ---
diff -up nmap-4.68/Makefile.in.nostrip nmap-4.68/Makefile.in
--- nmap-4.68/Makefile.in.nostrip	2008-07-24 10:17:22.000000000 +0200
+++ nmap-4.68/Makefile.in	2008-07-24 10:17:41.000000000 +0200
@@ -176,9 +176,6 @@ my_distclean:
 install-nmap: $(TARGET)
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(nmapdatadir)
 	$(INSTALL) -c -m 755 nmap $(DESTDIR)$(bindir)/nmap
-# Use strip -x to avoid stripping dynamically loaded NSE functions. See
-# http://seclists.org/nmap-dev/2007/q4/0272.html.
-	$(STRIP) -x $(DESTDIR)$(bindir)/nmap
 	$(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/
 	$(INSTALL) -c -m 644 docs/nmap.xsl $(DESTDIR)$(nmapdatadir)/
 	$(INSTALL) -c -m 644 docs/nmap.dtd $(DESTDIR)$(nmapdatadir)/


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- .cvsignore	12 May 2008 10:39:01 -0000	1.21
+++ .cvsignore	24 Jul 2008 08:38:43 -0000	1.22
@@ -1 +1 @@
-nmap-4.62.tar.bz2
+nmap-4.68.tar.bz2


Index: nmap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/devel/nmap.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- nmap.spec	12 May 2008 10:44:03 -0000	1.44
+++ nmap.spec	24 Jul 2008 08:38:43 -0000	1.45
@@ -1,6 +1,6 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
-Version: 4.62
+Version: 4.68
 Release: 1%{?dist}
 License: BSD with advertising, BSD, GPLv2
 Group: Applications/System
@@ -10,8 +10,7 @@
 Source3: nmapfe-48.png
 Patch1: nmap-4.03-mktemp.patch
 Patch2: nmap-4.52-noms.patch
-Patch3: nmap-4.60-nostrip.patch
-Patch4: nmap-4.52-pixmaps.patch
+Patch3: nmap-4.68-nostrip.patch
 URL: http://www.insecure.org/nmap/
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Epoch: 2
@@ -43,12 +42,11 @@
 %patch1 -p1 -b .mktemp
 %patch2 -p1 -b .noms
 %patch3 -p1 -b .nostrip
-%patch4 -p1 -b .pixmaps
 
 # we want pixmaps in /usr/share/pixmaps/zenmap/
-mkdir %{pixmap_srcdir}/zenmap
-mv %{pixmap_srcdir}/*.svg %{pixmap_srcdir}/zenmap
-mv %{pixmap_srcdir}/*.png %{pixmap_srcdir}/zenmap
+#mkdir %{pixmap_srcdir}/zenmap
+#mv %{pixmap_srcdir}/*.svg %{pixmap_srcdir}/zenmap
+#mv %{pixmap_srcdir}/*.png %{pixmap_srcdir}/zenmap
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS"
@@ -104,13 +102,15 @@
 %{python_sitelib}/*
 %{_datadir}/applications/nmap-zenmap.desktop
 %{_datadir}/icons/*
-%{_datadir}/pixmaps/zenmap
 %{_datadir}/zenmap
 %{_mandir}/man1/zenmap.1.gz
 %{_mandir}/man1/nmapfe.1.gz
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Thu Jul 24 2008 Tomas Smetana <tsmetana at redhat.com> - 2:4.68-1
+- new upstream version
+
 * Mon May 12 2008 Tomas Smetana <tsmetana at redhat.com> - 2:4.62-1
 - new upstream version
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nmap/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources	12 May 2008 10:39:01 -0000	1.21
+++ sources	24 Jul 2008 08:38:43 -0000	1.22
@@ -1 +1 @@
-4fdaa418f4008509d4c91ec087131d4e  nmap-4.62.tar.bz2
+c363d32a00c697d15996fced22072b6c  nmap-4.68.tar.bz2


--- nmap-4.60-nostrip.patch DELETED ---