[arch-commits] Commit in gnokii/repos (12 files)
Balló György
bgyorgy at nymeria.archlinux.org
Mon Aug 12 20:27:17 UTC 2013
Date: Monday, August 12, 2013 @ 22:27:17
Author: bgyorgy
Revision: 95469
archrelease: copy trunk to community-i686, community-x86_64
Added:
gnokii/repos/community-i686/PKGBUILD
(from rev 95468, gnokii/trunk/PKGBUILD)
gnokii/repos/community-i686/gnokii-config.patch
(from rev 95468, gnokii/trunk/gnokii-config.patch)
gnokii/repos/community-i686/gnokii-lock.patch
(from rev 95468, gnokii/trunk/gnokii-lock.patch)
gnokii/repos/community-i686/gnokii.install
(from rev 95468, gnokii/trunk/gnokii.install)
gnokii/repos/community-x86_64/PKGBUILD
(from rev 95468, gnokii/trunk/PKGBUILD)
gnokii/repos/community-x86_64/gnokii-config.patch
(from rev 95468, gnokii/trunk/gnokii-config.patch)
gnokii/repos/community-x86_64/gnokii-lock.patch
(from rev 95468, gnokii/trunk/gnokii-lock.patch)
gnokii/repos/community-x86_64/gnokii.install
(from rev 95468, gnokii/trunk/gnokii.install)
Deleted:
gnokii/repos/community-i686/PKGBUILD
gnokii/repos/community-i686/gnokii.patch
gnokii/repos/community-x86_64/PKGBUILD
gnokii/repos/community-x86_64/gnokii.patch
--------------------------------------+
/PKGBUILD | 120 +++++++++++++++++++++++++++++++++
community-i686/PKGBUILD | 47 ------------
community-i686/gnokii-config.patch | 12 +++
community-i686/gnokii-lock.patch | 15 ++++
community-i686/gnokii.install | 3
community-i686/gnokii.patch | 12 ---
community-x86_64/PKGBUILD | 47 ------------
community-x86_64/gnokii-config.patch | 12 +++
community-x86_64/gnokii-lock.patch | 15 ++++
community-x86_64/gnokii.install | 3
community-x86_64/gnokii.patch | 12 ---
11 files changed, 180 insertions(+), 118 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-08-12 20:27:08 UTC (rev 95468)
+++ community-i686/PKGBUILD 2013-08-12 20:27:17 UTC (rev 95469)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer:
-# 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
-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'
- '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')
-md5sums=('d9627f4a1152d3ea7806df4532850d5f'
- 'fd1c448114c2e0de8e05981030f0e69f')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- # FS#13249
- sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
-
- patch -Np1 -i "${srcdir}/gnokii.patch"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --enable-security \
- --disable-unix98test
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc"
-}
Copied: gnokii/repos/community-i686/PKGBUILD (from rev 95468, gnokii/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-08-12 20:27:17 UTC (rev 95469)
@@ -0,0 +1,60 @@
+# $Id$
+# 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=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')
+optdepends=('dialog: sendsms tool'
+ 'gtk2: xgnokii GUI'
+ 'libmariadbclient: smsd mysql backend'
+ 'postgresql-libs: smsd postgresql backend')
+backup=('etc/gnokiirc')
+options=('!libtool')
+install=$pkgname.install
+source=("http://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
+ 'gnokii-config.patch'
+ 'gnokii-lock.patch')
+md5sums=('d9627f4a1152d3ea7806df4532850d5f'
+ 'b2961b52ac1f770c4704ccc50b64fde2'
+ '17b629db85a6bb2b98ca59941aa95295')
+
+build() {
+ cd $pkgname-$pkgver
+
+ # Set bindir location
+ patch -Np1 -i "$srcdir/gnokii-config.patch"
+
+ # Set lock path
+ patch -Np1 -i "$srcdir/gnokii-lock.patch"
+
+ ./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
+ 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"
+}
Copied: gnokii/repos/community-i686/gnokii-config.patch (from rev 95468, gnokii/trunk/gnokii-config.patch)
===================================================================
--- community-i686/gnokii-config.patch (rev 0)
+++ community-i686/gnokii-config.patch 2013-08-12 20:27:17 UTC (rev 95469)
@@ -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.
Copied: gnokii/repos/community-i686/gnokii-lock.patch (from rev 95468, gnokii/trunk/gnokii-lock.patch)
===================================================================
--- community-i686/gnokii-lock.patch (rev 0)
+++ community-i686/gnokii-lock.patch 2013-08-12 20:27:17 UTC (rev 95469)
@@ -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 */
Copied: gnokii/repos/community-i686/gnokii.install (from rev 95468, gnokii/trunk/gnokii.install)
===================================================================
--- community-i686/gnokii.install (rev 0)
+++ community-i686/gnokii.install 2013-08-12 20:27:17 UTC (rev 95469)
@@ -0,0 +1,3 @@
+post_install() {
+echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
+}
Deleted: community-i686/gnokii.patch
===================================================================
--- community-i686/gnokii.patch 2013-08-12 20:27:08 UTC (rev 95468)
+++ community-i686/gnokii.patch 2013-08-12 20:27:17 UTC (rev 95469)
@@ -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.
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-08-12 20:27:08 UTC (rev 95468)
+++ community-x86_64/PKGBUILD 2013-08-12 20:27:17 UTC (rev 95469)
@@ -1,47 +0,0 @@
-# $Id$
-# Maintainer:
-# 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
-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'
- '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')
-md5sums=('d9627f4a1152d3ea7806df4532850d5f'
- 'fd1c448114c2e0de8e05981030f0e69f')
-
-build() {
- cd ${pkgname}-${pkgver}
-
- # FS#13249
- sed -i 's|cellphone|phone|' xgnokii/xgnokii.desktop.in
-
- patch -Np1 -i "${srcdir}/gnokii.patch"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --enable-security \
- --disable-unix98test
- make
-}
-
-package() {
- cd ${pkgname}-${pkgver}
- make DESTDIR="${pkgdir}" install
-
- install -Dm644 Docs/sample/gnokiirc "${pkgdir}/etc/gnokiirc"
-}
Copied: gnokii/repos/community-x86_64/PKGBUILD (from rev 95468, gnokii/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-08-12 20:27:17 UTC (rev 95469)
@@ -0,0 +1,60 @@
+# $Id$
+# 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=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')
+optdepends=('dialog: sendsms tool'
+ 'gtk2: xgnokii GUI'
+ 'libmariadbclient: smsd mysql backend'
+ 'postgresql-libs: smsd postgresql backend')
+backup=('etc/gnokiirc')
+options=('!libtool')
+install=$pkgname.install
+source=("http://www.gnokii.org/download/$pkgname/$pkgname-$pkgver.tar.bz2"
+ 'gnokii-config.patch'
+ 'gnokii-lock.patch')
+md5sums=('d9627f4a1152d3ea7806df4532850d5f'
+ 'b2961b52ac1f770c4704ccc50b64fde2'
+ '17b629db85a6bb2b98ca59941aa95295')
+
+build() {
+ cd $pkgname-$pkgver
+
+ # Set bindir location
+ patch -Np1 -i "$srcdir/gnokii-config.patch"
+
+ # Set lock path
+ patch -Np1 -i "$srcdir/gnokii-lock.patch"
+
+ ./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
+ 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"
+}
Copied: gnokii/repos/community-x86_64/gnokii-config.patch (from rev 95468, gnokii/trunk/gnokii-config.patch)
===================================================================
--- community-x86_64/gnokii-config.patch (rev 0)
+++ community-x86_64/gnokii-config.patch 2013-08-12 20:27:17 UTC (rev 95469)
@@ -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.
Copied: gnokii/repos/community-x86_64/gnokii-lock.patch (from rev 95468, gnokii/trunk/gnokii-lock.patch)
===================================================================
--- community-x86_64/gnokii-lock.patch (rev 0)
+++ community-x86_64/gnokii-lock.patch 2013-08-12 20:27:17 UTC (rev 95469)
@@ -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 */
Copied: gnokii/repos/community-x86_64/gnokii.install (from rev 95468, gnokii/trunk/gnokii.install)
===================================================================
--- community-x86_64/gnokii.install (rev 0)
+++ community-x86_64/gnokii.install 2013-08-12 20:27:17 UTC (rev 95469)
@@ -0,0 +1,3 @@
+post_install() {
+echo "Users need to be in 'lock' and 'uucp' groups to connect to devices"
+}
Deleted: community-x86_64/gnokii.patch
===================================================================
--- community-x86_64/gnokii.patch 2013-08-12 20:27:08 UTC (rev 95468)
+++ community-x86_64/gnokii.patch 2013-08-12 20:27:17 UTC (rev 95469)
@@ -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