From 7fe720573470607d326e0dd2727424c35b8e3a96 Mon Sep 17 00:00:00 2001
From: Tomas Smetana <tsmetana@fedoraproject.org>
Date: Mon, 7 Jan 2008 14:51:39 +0000
Subject: [PATCH] - bump release because of build error

---
 nmap-4.52-noms.patch    | 24 ++++++++++++++++++++++++
 nmap-4.52-nostrip.patch | 13 +++++++++++++
 nmap-4.52-pixmaps.patch | 12 ++++++++++++
 nmap.spec               |  5 ++++-
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 nmap-4.52-noms.patch
 create mode 100644 nmap-4.52-nostrip.patch
 create mode 100644 nmap-4.52-pixmaps.patch

diff --git a/nmap-4.52-noms.patch b/nmap-4.52-noms.patch
new file mode 100644
index 0000000..9e6916a
--- /dev/null
+++ b/nmap-4.52-noms.patch
@@ -0,0 +1,24 @@
+diff -up nmap-4.52/docs/nmap.1.noms nmap-4.52/docs/nmap.1
+--- nmap-4.52/docs/nmap.1.noms	2008-01-07 12:51:51.000000000 +0100
++++ nmap-4.52/docs/nmap.1	2008-01-07 12:52:11.000000000 +0100
+@@ -106,7 +106,7 @@ Nmap 4\.52 ( http://insecure\.org )
+ Usage: nmap [Scan Type(s)] [Options] {target specification}
+ TARGET SPECIFICATION:
+   Can pass hostnames, IP addresses, networks, etc\.
+-  Ex: scanme\.nmap\.org, microsoft\.com/24, 192\.168\.0\.1; 10\.0\.0\-255\.1\-254
++  Ex: scanme\.nmap\.org, 192\.168\.0\.1; 10\.0\.0\-255\.1\-254
+   \-iL <inputfilename>: Input from list of hosts/networks
+   \-iR <num hosts>: Choose random targets
+   \-\-exclude <host1[,host2][,host3],\.\.\.>: Exclude hosts/networks
+diff -up nmap-4.52/docs/nmap.usage.txt.noms nmap-4.52/docs/nmap.usage.txt
+--- nmap-4.52/docs/nmap.usage.txt.noms	2008-01-07 12:41:32.000000000 +0100
++++ nmap-4.52/docs/nmap.usage.txt	2008-01-07 12:42:15.000000000 +0100
+@@ -2,7 +2,7 @@ Nmap 4.52 ( http://insecure.org )
+ Usage: nmap [Scan Type(s)] [Options] {target specification}
+ TARGET SPECIFICATION:
+   Can pass hostnames, IP addresses, networks, etc.
+-  Ex: scanme.nmap.org, microsoft.com/24, 192.168.0.1; 10.0.0-255.1-254
++  Ex: scanme.nmap.org, 192.168.0.1; 10.0.0-255.1-254
+   -iL <inputfilename>: Input from list of hosts/networks
+   -iR <num hosts>: Choose random targets
+   --exclude <host1[,host2][,host3],...>: Exclude hosts/networks
diff --git a/nmap-4.52-nostrip.patch b/nmap-4.52-nostrip.patch
new file mode 100644
index 0000000..e0e5e92
--- /dev/null
+++ b/nmap-4.52-nostrip.patch
@@ -0,0 +1,13 @@
+diff -up nmap-4.52/Makefile.in.nostrip nmap-4.52/Makefile.in
+--- nmap-4.52/Makefile.in.nostrip	2008-01-07 12:42:42.000000000 +0100
++++ nmap-4.52/Makefile.in	2008-01-07 12:46:53.000000000 +0100
+@@ -175,9 +175,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)/
diff --git a/nmap-4.52-pixmaps.patch b/nmap-4.52-pixmaps.patch
new file mode 100644
index 0000000..c8f4636
--- /dev/null
+++ b/nmap-4.52-pixmaps.patch
@@ -0,0 +1,12 @@
+diff -up nmap-4.52/zenmap/setup.py.pixmaps nmap-4.52/zenmap/setup.py
+--- nmap-4.52/zenmap/setup.py.pixmaps	2008-01-07 12:53:24.000000000 +0100
++++ nmap-4.52/zenmap/setup.py	2008-01-07 12:53:35.000000000 +0100
+@@ -37,7 +37,7 @@ from zenmapCore.Name import APP_NAME, AP
+ # Directories for POSIX operating systems
+ # These are created after a "install" or "py2exe" command
+ # These directories are relative to the installation or dist directory
+-pixmaps_dir = os.path.join('share', 'pixmaps')
++pixmaps_dir = os.path.join('share', 'pixmaps', APP_NAME)
+ icons_dir = os.path.join('share', 'icons')
+ locale_dir = os.path.join('share', APP_NAME, 'locale')
+ config_dir = os.path.join('share', APP_NAME, 'config')
diff --git a/nmap.spec b/nmap.spec
index f0498c1..ab75b27 100644
--- a/nmap.spec
+++ b/nmap.spec
@@ -1,7 +1,7 @@
 Summary: Network exploration tool and security scanner
 Name: nmap
 Version: 4.52
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD with advertising, BSD, GPLv2
 Group: Applications/System
 Source0: http://download.insecure.org/nmap/dist/%{name}-%{version}.tar.bz2
@@ -108,6 +108,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/xnmap.1.gz
 
 %changelog
+* Mon Jan 07 2008 Tomas Smetana <tsmetana@redhat.com> - 2:4.52-2
+- bump release because of build error
+
 * Mon Jan 07 2008 Tomas Smetana <tsmetana@redhat.com> - 2:4.52-1
 - new upstream version