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

[Alexander Rødseth]

    Date: Monday, April 7, 2014 @ 22:58:14
  Author: arodseth
Revision: 108938

archrelease: copy trunk to community-x86_64, community-i686

Added:
  mahjong/repos/community-i686/PKGBUILD
    (from rev 108937, mahjong/trunk/PKGBUILD)
  mahjong/repos/community-x86_64/PKGBUILD
    (from rev 108937, mahjong/trunk/PKGBUILD)
Deleted:
  mahjong/repos/community-i686/PKGBUILD
  mahjong/repos/community-x86_64/PKGBUILD

---------------------------+
 /PKGBUILD                 |   84 ++++++++++++++++++++++++++++++++++++++++++++
 community-i686/PKGBUILD   |   26 -------------
 community-x86_64/PKGBUILD |   26 -------------
 3 files changed, 84 insertions(+), 52 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-04-07 20:57:58 UTC (rev 108937)
+++ community-i686/PKGBUILD	2014-04-07 20:58:14 UTC (rev 108938)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
-# Contributor: Jason Chu <jchu at xentac.net>
-
-pkgname=mahjong
-pkgver=1.12.1
-pkgrel=1
-pkgdesc="The classical game of Mah Jong (not the solitare version) with network support"
-arch=('i686' 'x86_64')
-url="http://www.stevens-bradfield.com/MahJong/"
-license=('GPL' 'custom')
-depends=('gtk2')
-source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz)
-md5sums=('a74acae39d6a49bad9c34b84088f72f3')
-
-build() {
-  cd "$srcdir/mj-$pkgver-src"
-  sed -i 's/& Calling/Calling/' gui-dial.c
-  make LDLIBS="-lm"
-}
-
-package() {
-  cd "$srcdir/mj-$pkgver-src"
-  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
-  install -D -m644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
-}

Copied: mahjong/repos/community-i686/PKGBUILD (from rev 108937, mahjong/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-04-07 20:58:14 UTC (rev 108938)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+# Contributor: Jason Chu <jchu at xentac.net>
+
+pkgname=mahjong
+pkgver=1.14
+pkgrel=1
+pkgdesc='The classical game of Mah Jong (not the solitare version) with network support'
+arch=('x86_64' 'i686')
+url='http://mahjong.julianbradfield.org/'
+license=('GPL' 'custom')
+depends=('gtk2')
+makedepends=('gendesk' 'imagemagick')
+source=("http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz")
+sha256sums=('976c9e0e11b78066cd74568992ff5382930711d7536bb11c9fa6877366c63dd6')
+
+prepare() {
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
+    --categories 'Application;Game' --exec xmj 
+  convert "mj-$pkgver-src/icon.ico" "$pkgname.png"
+}
+
+build() {
+  cd "mj-$pkgver-src"
+
+  sed -i 's/& Calling/Calling/' gui-dial.c
+  make LDLIBS="-lm"
+}
+
+package() {
+  cd "mj-$pkgver-src"
+
+  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
+  install -Dm644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-04-07 20:57:58 UTC (rev 108937)
+++ community-x86_64/PKGBUILD	2014-04-07 20:58:14 UTC (rev 108938)
@@ -1,26 +0,0 @@
-# $Id$
-# Maintainer: Kevin Piche <kevin at archlinux.org>
-# Contributor: Jason Chu <jchu at xentac.net>
-
-pkgname=mahjong
-pkgver=1.12.1
-pkgrel=1
-pkgdesc="The classical game of Mah Jong (not the solitare version) with network support"
-arch=('i686' 'x86_64')
-url="http://www.stevens-bradfield.com/MahJong/"
-license=('GPL' 'custom')
-depends=('gtk2')
-source=(http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz)
-md5sums=('a74acae39d6a49bad9c34b84088f72f3')
-
-build() {
-  cd "$srcdir/mj-$pkgver-src"
-  sed -i 's/& Calling/Calling/' gui-dial.c
-  make LDLIBS="-lm"
-}
-
-package() {
-  cd "$srcdir/mj-$pkgver-src"
-  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
-  install -D -m644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
-}

Copied: mahjong/repos/community-x86_64/PKGBUILD (from rev 108937, mahjong/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-04-07 20:58:14 UTC (rev 108938)
@@ -0,0 +1,42 @@
+# $Id$
+# Maintainer: Alexander Rødseth <rodseth at gmail.com>
+# Contributor: Kevin Piche <kevin at archlinux.org>
+# Contributor: Jason Chu <jchu at xentac.net>
+
+pkgname=mahjong
+pkgver=1.14
+pkgrel=1
+pkgdesc='The classical game of Mah Jong (not the solitare version) with network support'
+arch=('x86_64' 'i686')
+url='http://mahjong.julianbradfield.org/'
+license=('GPL' 'custom')
+depends=('gtk2')
+makedepends=('gendesk' 'imagemagick')
+source=("http://mahjong.julianbradfield.org/Source/mj-$pkgver-src.tar.gz")
+sha256sums=('976c9e0e11b78066cd74568992ff5382930711d7536bb11c9fa6877366c63dd6')
+
+prepare() {
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" \
+    --categories 'Application;Game' --exec xmj 
+  convert "mj-$pkgver-src/icon.ico" "$pkgname.png"
+}
+
+build() {
+  cd "mj-$pkgver-src"
+
+  sed -i 's/& Calling/Calling/' gui-dial.c
+  make LDLIBS="-lm"
+}
+
+package() {
+  cd "mj-$pkgver-src"
+
+  make DESTDIR="$pkgdir/usr/" MANDIR=share/man/man1 install install.man
+  install -Dm644 tiles-v1/README "$pkgdir/usr/share/licenses/$pkgname/tiles-license.txt"
+  install -Dm644 "$srcdir/$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$srcdir/$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
+}
+
+# vim:set ts=2 sw=2 et: