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

[Eric Bélanger]

    Date: Sunday, March 15, 2009 @ 23:01:40
  Author: eric
Revision: 30075

Fixed svn conflict

Added:
  glsof/repos/extra-i686/ChangeLog
    (from rev 30063, glsof/trunk/ChangeLog)
  glsof/repos/extra-i686/glsof.desktop
    (from rev 30063, glsof/trunk/glsof.desktop)
Modified:
  glsof/repos/extra-i686/	(properties)
  glsof/repos/extra-i686/PKGBUILD

---------------+
 ChangeLog     |    6 ++++++
 PKGBUILD      |   20 +++++++++++++-------
 glsof.desktop |   12 ++++++++++++
 3 files changed, 31 insertions(+), 7 deletions(-)


Property changes on: glsof/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /glsof/trunk:1
   + /glsof/trunk:1-30074

Copied: glsof/repos/extra-i686/ChangeLog (from rev 30063, glsof/trunk/ChangeLog)
===================================================================
--- extra-i686/ChangeLog	                        (rev 0)
+++ extra-i686/ChangeLog	2009-03-16 03:01:40 UTC (rev 30075)
@@ -0,0 +1,6 @@
+2009-03-14  Eric Belanger  <eric at archlinux.org>
+
+	* glsof 0.9.16-5
+	* Added license
+	* Added .desktop file
+	* Added ChangeLog

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-03-16 02:59:12 UTC (rev 30074)
+++ extra-i686/PKGBUILD	2009-03-16 03:01:40 UTC (rev 30075)
@@ -1,19 +1,25 @@
 # $Id$
-# Maintainer: damir <damir at archlinux.org>
+# Maintainer: Eric Belanger <eric at archlinux.org>
 # Contributor: Damir Perisa <damir.perisa at bluewin.ch>
 
 pkgname=glsof
 pkgver=0.9.16
-pkgrel=4
+pkgrel=5
 pkgdesc="A gtk-GUI for lsof (aka GTK-lsof)"
+arch=('i686' 'x86_64')
 url="http://glsof.sourceforge.net/"
+license=('GPL')
 depends=('libxml2' 'gtk2' 'lsof')
-source=(http://dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('5ad5f2a6908be713753d9826c38e3e2c')
+source=(http://download.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz glsof.desktop)
+md5sums=('5ad5f2a6908be713753d9826c38e3e2c' '1a6ab5bf5ef44ae31b8b7461b76f62db')
+sha1sums=('80f4596ad09c5ddb463bad299a76ce275c0ecd4d' '647be33bea11fec6ba0bfd59c02034dc64925e52')
 
 build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr || return 1
   make || return 1
-  make prefix=$startdir/pkg/usr install
+  make DESTDIR=${pkgdir} install || return 1
+  install -D -m644 ../glsof.desktop ${pkgdir}/usr/share/applications/glsof.desktop || return 1
+  install -d ${pkgdir}/usr/share/pixmaps
+  ln -s /usr/share/glsof/pixmaps/logo.png ${pkgdir}/usr/share/pixmaps/glsof.png
 }

Copied: glsof/repos/extra-i686/glsof.desktop (from rev 30063, glsof/trunk/glsof.desktop)
===================================================================
--- extra-i686/glsof.desktop	                        (rev 0)
+++ extra-i686/glsof.desktop	2009-03-16 03:01:40 UTC (rev 30075)
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Name=glsof
+Comment=A GUI for lsof
+Comment[pl]=GUI do lsof
+Exec=glsof
+Icon=glsof.png
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=GTK;System;Monitor;
+Encoding=UTF-8
+# vi: encoding=utf-8