[arch-commits] Commit in nmap/repos (4 files)

[Eric Belanger]

    Date: Thursday, July 10, 2008 @ 21:26:59
  Author: eric
Revision: 4861

Merged revisions 4769-4860 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/nmap/trunk

........
  r4777 | douglas | 2008-07-09 22:53:20 -0400 (Wed, 09 Jul 2008) | 2 lines
  
  upgpkg: nmap 4.68-2
      Fixing the zenmap pixmaps path
........
  r4860 | eric | 2008-07-10 21:26:47 -0400 (Thu, 10 Jul 2008) | 2 lines
  
  upgpkg: nmap 4.68-2
      removed old patch from source array
........

Modified:
  nmap/repos/extra-x86_64/	(properties)
  nmap/repos/extra-x86_64/ChangeLog
  nmap/repos/extra-x86_64/PKGBUILD
Deleted:
  nmap/repos/extra-x86_64/zenmap_pixmaps.patch

----------------------+
 ChangeLog            |    4 ++++
 PKGBUILD             |   14 +++-----------
 zenmap_pixmaps.patch |   24 ------------------------
 3 files changed, 7 insertions(+), 35 deletions(-)


Property changes on: nmap/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /nmap/trunk:1-4768
   + /nmap/trunk:1-4860

Modified: extra-x86_64/ChangeLog
===================================================================
--- extra-x86_64/ChangeLog	2008-07-11 01:26:47 UTC (rev 4860)
+++ extra-x86_64/ChangeLog	2008-07-11 01:26:59 UTC (rev 4861)
@@ -1,5 +1,9 @@
 
 2008-07-09  Douglas Soares de Andrade  <douglas at archlinux.org>
 
+	* Fixing the pixmaps path for i686: 4.68
+
+2008-07-09  Douglas Soares de Andrade  <douglas at archlinux.org>
+
 	* Updated for i686: 4.68
 

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-07-11 01:26:47 UTC (rev 4860)
+++ extra-x86_64/PKGBUILD	2008-07-11 01:26:59 UTC (rev 4861)
@@ -3,7 +3,7 @@
 
 pkgname=nmap
 pkgver=4.68
-pkgrel=1
+pkgrel=2
 pkgdesc="A network exploration tool and security/port scanner"
 arch=(i686 x86_64)
 url="http://nmap.org"
@@ -12,25 +12,17 @@
 # python is needed for zenmap
 makedepends=('python')
 options=('!makeflags')
-source=(http://download.insecure.org/nmap/dist/$pkgname-$pkgver.tgz
-        zenmap_pixmaps.patch)
+source=(http://download.insecure.org/nmap/dist/$pkgname-$pkgver.tgz)
+md5sums=('a1373c992e4b21d8db4d65c6eb8fec42')
 
-md5sums=('a1373c992e4b21d8db4d65c6eb8fec42'
-         '91674cf81562064627bc5359277857fb')
-
 build() {
   cd $startdir/src/$pkgname-$pkgver
-  # patch so zenmap pixmaps are installed in a subdirectory
-  patch -Np1 < ../zenmap_pixmaps.patch
 
   ./configure --prefix=/usr --mandir=/usr/share/man \
     --libexecdir=/usr/lib
   make || return 1
   make DESTDIR="$startdir/pkg" install
 
-  # super ugly- we have to move these in the source too
-  mv zenmap/share/zenmap/pixmaps/{*.png,*.svg} $startdir/pkg/usr/share/pixmaps/zenmap/
-  
   # remove zenmap uninstall script
   rm "$startdir/pkg/usr/bin/uninstall_zenmap"
 

Deleted: extra-x86_64/zenmap_pixmaps.patch
===================================================================
--- extra-x86_64/zenmap_pixmaps.patch	2008-07-11 01:26:47 UTC (rev 4860)
+++ extra-x86_64/zenmap_pixmaps.patch	2008-07-11 01:26:59 UTC (rev 4861)
@@ -1,24 +0,0 @@
-diff -Naur nmap-4.68/zenmap/setup.py nmap-4.68-new/zenmap/setup.py
---- nmap-4.68/zenmap/setup.py	2008-06-06 02:55:01.000000000 -0300
-+++ nmap-4.68-new/zenmap/setup.py	2008-07-09 00:57:19.000000000 -0300
-@@ -44,7 +44,7 @@
- # These are created after a "install" or "py2exe" command
- # These directories are relative to the installation or dist directory
- data_dir = os.path.join('share', APP_NAME)
--pixmaps_dir = os.path.join(data_dir, 'pixmaps')
-+pixmaps_dir = os.path.join('share', 'pixmaps', APP_NAME)
- locale_dir = os.path.join(data_dir, 'locale')
- config_dir = os.path.join(data_dir, 'config')
- docs_dir = os.path.join(data_dir, 'docs')
-diff -Naur nmap-4.68/zenmap/zenmapCore/Paths.py nmap-4.68-new/zenmap/zenmapCore/Paths.py
---- nmap-4.68/zenmap/zenmapCore/Paths.py	2008-06-06 02:32:19.000000000 -0300
-+++ nmap-4.68-new/zenmap/zenmapCore/Paths.py	2008-07-09 00:59:22.000000000 -0300
-@@ -60,7 +60,7 @@
- CONFIG_DIR = join(prefix, "share", APP_NAME, "config")
- LOCALE_DIR = join(prefix, "share", APP_NAME, "locale")
- MISC_DIR = join(prefix, "share", APP_NAME, "misc")
--PIXMAPS_DIR = join(prefix, "share", "zenmap", "pixmaps")
-+PIXMAPS_DIR = join(prefix, "share", "zenmap", "pixmaps", APP_NAME)
- DOCS_DIR = join(prefix, "share", APP_NAME, "docs")
- 
- def get_extra_executable_search_paths():