[arch-commits] Commit in gnome-commander/trunk (PKGBUILD gnome-commander.install)

[Alexander Rødseth]

    Date: Monday, November 4, 2013 @ 13:30:09
  Author: arodseth
Revision: 100461

Minor changes

Modified:
  gnome-commander/trunk/PKGBUILD
  gnome-commander/trunk/gnome-commander.install

-------------------------+
 PKGBUILD                |   38 ++++++++++++++++++++------------------
 gnome-commander.install |    6 ++++--
 2 files changed, 24 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-04 12:14:25 UTC (rev 100460)
+++ PKGBUILD	2013-11-04 12:30:09 UTC (rev 100461)
@@ -1,5 +1,6 @@
 # $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Ionut Biru <ibiru at archlinux.org>
 # Contributor: Roman Kyrylych <roman at archlinux.org>
 # Contributor: Johannes Sjolund <j.sjolund at gmail.com>
 
@@ -6,36 +7,37 @@
 pkgname=gnome-commander
 pkgver=1.2.8.15
 pkgrel=1
-pkgdesc="A graphical two-pane filemanager for Gnome"
-arch=('i686' 'x86_64')
-url="http://www.nongnu.org/gcmd/"
+pkgdesc='Graphical two-pane filemanager for Gnome'
+arch=('x86_64' 'i686')
+url='http://www.nongnu.org/gcmd/'
 license=('GPL')
 depends=('libgnomeui' 'gnome-vfs' 'gconf' 'python2' 'libsm')
 makedepends=('perlxml' 'gnome-doc-utils>=0.20.1' 'intltool')
-install=gnome-commander.install
-source=(ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz)
+install="$pkgname.install"
+source=("ftp://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/$pkgname-$pkgver.tar.xz")
 sha256sums=('d2feecf215db3e0faeb873c559087c2ad9af0a5aac26e2b1b32b28be939da37f')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
 
-  # python2 fix
-  for file in doc/*/gnome-commander.xml; do
-      sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' $file
+  # Python 2 fix
+  for f in doc/*/gnome-commander.xml; do
+      sed -i 's:env python:env python2:' "$f"
   done
 
   ./configure --prefix=/usr --libdir=/usr/lib --sysconfdir=/etc \
-    --localstatedir=/var --disable-scrollkeeper --enable-python
-
+              --localstatedir=/var --disable-scrollkeeper --enable-python
   make
 }
 
 package() {
-   cd "$srcdir/$pkgname-$pkgver"
+  cd "$pkgname-$pkgver"
+
   make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+  install -d "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
+    --domain "$pkgname" "$pkgdir/etc/gconf/schemas/"*.schemas
+  rm -rf "$pkgdir/etc/gconf/schemas/"
+}
 
-  mkdir -p "$pkgdir"/usr/share/gconf/schemas
-  gconf-merge-schema "$pkgdir"/usr/share/gconf/schemas/$pkgname.schemas \
-    --domain $pkgname "$pkgdir"/etc/gconf/schemas/*.schemas
-  rm -rf "$pkgdir"/etc/gconf/schemas/
-}
+# vim:set ts=2 sw=2 et:

Modified: gnome-commander.install
===================================================================
--- gnome-commander.install	2013-11-04 12:14:25 UTC (rev 100460)
+++ gnome-commander.install	2013-11-04 12:30:09 UTC (rev 100461)
@@ -1,7 +1,7 @@
 pkgname=gnome-commander
 
 post_install() {
-  usr/sbin/gconfpkg --install ${pkgname}
+  usr/sbin/gconfpkg --install "$pkgname"
   update-desktop-database -q
 }
 
@@ -14,9 +14,11 @@
 }
 
 pre_remove() {
-  usr/sbin/gconfpkg --uninstall ${pkgname}
+  usr/sbin/gconfpkg --uninstall "$pkgname"
 }
 
 post_remove() {
   update-desktop-database -q
 }
+
+# vim:set ts=2 sw=2 et: