From 2136a1ff0f53224dff665c452f1f9f851acb52d5 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Thu, 24 Jul 2008 08:38:43 +0000
Subject: [PATCH] - new upstream version

---
 .cvsignore                                       |  2 +-
 ...4.60-nostrip.patch => nmap-4.68-nostrip.patch | 10 +++++-----
 nmap.spec                                        | 16 ++++++++--------
 sources                                          |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)
 rename nmap-4.60-nostrip.patch => nmap-4.68-nostrip.patch (61%)

diff --git a/.cvsignore b/.cvsignore
index 3bb72ec..1b13eeb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nmap-4.62.tar.bz2
+nmap-4.68.tar.bz2
diff --git a/nmap-4.60-nostrip.patch b/nmap-4.68-nostrip.patch
similarity index 61%
rename from nmap-4.60-nostrip.patch
rename to nmap-4.68-nostrip.patch
index 6deab4d..59df2ba 100644
--- a/nmap-4.60-nostrip.patch
+++ b/nmap-4.68-nostrip.patch
@@ -1,13 +1,13 @@
-diff -up nmap-4.60/Makefile.in.nostrip nmap-4.60/Makefile.in
---- nmap-4.60/Makefile.in.nostrip	2008-04-03 13:42:59.000000000 +0200
-+++ nmap-4.60/Makefile.in	2008-04-03 13:43:06.000000000 +0200
-@@ -175,9 +175,6 @@ my_distclean:
+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 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/
+ 	$(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)/
diff --git a/nmap.spec b/nmap.spec
index 7687ec2..911978a 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -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 @@ Source2: nmapfe-32.png
 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 @@ be installed before installing nmap-frontend.
 %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 @@ rm -rf $RPM_BUILD_ROOT
 %{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@redhat.com> - 2:4.68-1
+- new upstream version
+
 * Mon May 12 2008 Tomas Smetana <tsmetana@redhat.com> - 2:4.62-1
 - new upstream version
 
diff --git a/sources b/sources
index de20385..6abee5b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fdaa418f4008509d4c91ec087131d4e  nmap-4.62.tar.bz2
+c363d32a00c697d15996fced22072b6c  nmap-4.68.tar.bz2