[arch-commits] Commit in gnokii/trunk (5 files)

Balló György bgyorgy at nymeria.archlinux.org
Mon Aug 12 20:27:08 UTC 2013


    Date: Monday, August 12, 2013 @ 22:27:08
  Author: bgyorgy
Revision: 95468

upgpkg: gnokii 0.6.31-6

* General cleanup
* Fix building xgnokii
* Fix device locking
* Make sendsms executable
* Add dialog to optdepends (required for sendsms tool)
* Notifiy the user about required group permissions

Added:
  gnokii/trunk/gnokii-config.patch
  gnokii/trunk/gnokii-lock.patch
  gnokii/trunk/gnokii.install
Modified:
  gnokii/trunk/PKGBUILD
Deleted:
  gnokii/trunk/gnokii.patch

---------------------+
 PKGBUILD            |   53 +++++++++++++++++++++++++++++++-------------------
 gnokii-config.patch |   12 +++++++++++
 gnokii-lock.patch   |   15 ++++++++++++++
 gnokii.install      |    3 ++
 gnokii.patch        |   12 -----------
 5 files changed, 63 insertions(+), 32 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-12 19:57:14 UTC (rev 95467)
+++ PKGBUILD	2013-08-12 20:27:08 UTC (rev 95468)
@@ -1,47 +1,60 @@
 # $Id$
-# Maintainer:
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Roman Kyrylych <roman at archlinux.org>
 # Contributor: Aurelien Foret <orelien at chez.com>
 
 pkgname=gnokii
 pkgver=0.6.31
-pkgrel=5
+pkgrel=6
 pkgdesc="Tools and user space driver for use with mobile phones"
 arch=('i686' 'x86_64')
 url="http://www.gnokii.org/"
 license=('GPL')
 depends=('libusb-compat' 'libxpm' 'bluez-libs' 'libical' 'sqlite')
-makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb')
-optdepends=('gtk2: xgnokii GUI'
+makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool')
+optdepends=('dialog: sendsms tool'
+            'gtk2: xgnokii GUI'
             'libmariadbclient: smsd mysql backend'
             'postgresql-libs: smsd postgresql backend')
 backup=('etc/gnokiirc')
-options=('!libtool' '!makeflags')
-source=("http://www.gnokii.org/download/$pkgname/$pkgname-${pkgver}.tar.bz2"
-        'gnokii.patch')
+options=('!libtool')
+install=$pkgname.install
+source=("http://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
+        'gnokii-config.patch'
+        'gnokii-lock.patch')
 md5sums=('d9627f4a1152d3ea7806df4532850d5f'
-         'fd1c448114c2e0de8e05981030f0e69f')
+         'b2961b52ac1f770c4704ccc50b64fde2'
+         '17b629db85a6bb2b98ca59941aa95295')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd $pkgname-$pkgver
 
-  # FS#13249
-  sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
+  # Set bindir location
+  patch -Np1 -i "$srcdir/gnokii-config.patch"
 
-  patch -Np1 -i "${srcdir}/gnokii.patch"
+  # Set lock path
+  patch -Np1 -i "$srcdir/gnokii-lock.patch"
 
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --sbindir=/usr/bin \
-    --enable-security \
-    --disable-unix98test
+  ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin \
+              --disable-static --enable-security
   make
+  pushd xgnokii
+  make
+  popd
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
+  cd $pkgname-$pkgver
 
-  install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc"
+  make DESTDIR="$pkgdir" install
+  pushd xgnokii
+  make DESTDIR="$pkgdir" install
+  popd
+
+  # Install inital config file
+  install -Dm644 Docs/sample/gnokiirc "$pkgdir/etc/gnokiirc"
+
+  # Fix file permission
+  chmod 755 "$pkgdir/usr/bin/sendsms"
 }

Added: gnokii-config.patch
===================================================================
--- gnokii-config.patch	                        (rev 0)
+++ gnokii-config.patch	2013-08-12 20:27:08 UTC (rev 95468)
@@ -0,0 +1,12 @@
+diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc
+--- gnokii-0.6.31.orig/Docs/sample/gnokiirc	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/Docs/sample/gnokiirc	2012-02-18 12:49:26.957557504 +0100
+@@ -238,7 +238,7 @@
+ # In particular ensure that mgnokiidev is in this location, with
+ # permissions 4750, owned by root, group gnokii.  Ensure you
+ # are in the gnokii group and that the group exists...
+-bindir = /usr/local/sbin/
++bindir = /usr/bin/
+ 
+ # Any entries in the following two sections will be set as environment
+ # variables when running the scripts.

Added: gnokii-lock.patch
===================================================================
--- gnokii-lock.patch	                        (rev 0)
+++ gnokii-lock.patch	2013-08-12 20:27:08 UTC (rev 95468)
@@ -0,0 +1,15 @@
+diff -Naur gnokii-0.6.31.orig/common/misc.c gnokii-0.6.31/common/misc.c
+--- gnokii-0.6.31.orig/common/misc.c	2011-12-02 15:53:04.000000000 +0100
++++ gnokii-0.6.31/common/misc.c	2013-08-12 18:38:41.021668458 +0200
+@@ -448,9 +448,9 @@
+ 
+ #define BUFFER_MAX_LENGTH 128
+ #if defined (__svr4__)
+-#  define lock_path "/var/run/LCK.."
++#  define lock_path "/var/run/lockdev/LCK.."
+ #else
+-#  define lock_path "/var/lock/LCK.."
++#  define lock_path "/var/lock/lockdev/LCK.."
+ #endif
+ 
+ /* Lock the device. Return allocated string with a lock name */

Added: gnokii.install
===================================================================
--- gnokii.install	                        (rev 0)
+++ gnokii.install	2013-08-12 20:27:08 UTC (rev 95468)
@@ -0,0 +1,3 @@
+post_install() {
+echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
+}

Deleted: gnokii.patch
===================================================================
--- gnokii.patch	2013-08-12 19:57:14 UTC (rev 95467)
+++ gnokii.patch	2013-08-12 20:27:08 UTC (rev 95468)
@@ -1,12 +0,0 @@
-diff -Nura gnokii-0.6.31.orig/Docs/sample/gnokiirc gnokii-0.6.31/Docs/sample/gnokiirc
---- gnokii-0.6.31.orig/Docs/sample/gnokiirc	2011-12-02 15:53:04.000000000 +0100
-+++ gnokii-0.6.31/Docs/sample/gnokiirc	2012-02-18 12:49:26.957557504 +0100
-@@ -238,7 +238,7 @@
- # In particular ensure that mgnokiidev is in this location, with
- # permissions 4750, owned by root, group gnokii.  Ensure you
- # are in the gnokii group and that the group exists...
--bindir = /usr/local/sbin/
-+bindir = /usr/sbin/
- 
- # Any entries in the following two sections will be set as environment
- # variables when running the scripts.




More information about the arch-commits mailing list