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

2016-05-17 Thread Laurent Carlier 
Date: Tuesday, May 17, 2016 @ 23:56:51
  Author: lcarlier
Revision: 175601

upgpkg: minetest 0.4.14-1

upstream update 0.4.14

Modified:
  minetest/trunk/PKGBUILD
Deleted:
  minetest/trunk/minetest.install

--+
 PKGBUILD |   13 ++---
 minetest.install |   12 
 2 files changed, 6 insertions(+), 19 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-05-17 21:56:46 UTC (rev 175600)
+++ PKGBUILD2016-05-17 21:56:51 UTC (rev 175601)
@@ -3,8 +3,8 @@
 # Contributor: Konsta Kokkinen 
 
 pkgname=('minetest' 'minetest-server' 'minetest-common')
-pkgver=0.4.13
-pkgrel=4
+pkgver=0.4.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://minetest.net/'
 license=('GPL')
@@ -13,8 +13,8 @@
 
source=($pkgname-$pkgver.tar.gz::https://github.com/minetest/minetest/archive/$pkgver.tar.gz
 
$pkgname-data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/$pkgver.tar.gz
 minetest@.service)
-md5sums=('e3385b55faeb1164ac5349dd9b21b461'
- 'cc02e8844bbfbd14a3545a202ef38772'
+md5sums=('3c59e042ab69f07871618c707092beb8'
+ '22a472d15175bc5e3f5289a2f19d9b5a'
  'ec193b09eb85f2518aaa17506ad06c57')
 
 prepare() {
@@ -46,7 +46,6 @@
   pkgdesc='Multiplayer infinite-world block sandbox game'
   depends=('minetest-common' 'irrlicht' 'curl' 'libvorbis' 'sqlite'
'openal' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
-  install=$pkgname.install
 
   cd build-client
   make DESTDIR="$pkgdir" install
@@ -59,7 +58,7 @@
 package_minetest-server() {
   pkgdesc='Server of infinite-world block sandbox game'
   depends=('minetest-common' 'leveldb' 'curl' 'sqlite' 'hiredis')
-  install=$pkgname.install
+  install=minetest-server.install
 
   cd build-server
   make DESTDIR="$pkgdir" install
@@ -81,7 +80,7 @@
   cp -r "$srcdir"/minetest_game-$pkgver 
"$pkgdir"/usr/share/minetest/games/minetest
   rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
 
-  for file in doc/{lua_api,mapformat,menu_lua_api}.txt minetest.conf.example; 
do
+  for file in doc/{fst_api,lua_api,menu_lua_api,protocol,world_format}.txt; do
 install -Dm644 $file "$pkgdir"/usr/share/minetest/doc/$(basename $file)
   done
 }

Deleted: minetest.install
===
--- minetest.install2016-05-17 21:56:46 UTC (rev 175600)
+++ minetest.install2016-05-17 21:56:51 UTC (rev 175601)
@@ -1,12 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-desktop-database &>/dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

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

2014-08-22 Thread Bartłomiej Piotrowski 
Date: Friday, August 22, 2014 @ 10:44:21
  Author: bpiotrowski
Revision: 117747

upgpkg: minetest 0.4.10-3

split the package into client, server and data common packages

Modified:
  minetest/trunk/PKGBUILD
  minetest/trunk/minetest.install

--+
 PKGBUILD |   79 +++--
 minetest.install |   13 ++--
 2 files changed, 63 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2014-08-22 07:46:47 UTC (rev 117746)
+++ PKGBUILD2014-08-22 08:44:21 UTC (rev 117747)
@@ -2,41 +2,80 @@
 # Maintainer: Laurent Carlier lordhea...@gmail.com
 # Contributor: Konsta Kokkinen k...@tsundere.fi
 
-pkgname=minetest
+pkgname=('minetest' 'minetest-server' 'minetest-common')
 pkgver=0.4.10
-pkgrel=2
+pkgrel=3
 pkgdesc='An Infiniminer/Minecraft inspired game'
 arch=('i686' 'x86_64')
 url='http://minetest.net/'
 license=('GPL')
-depends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 'irrlicht'
- 'hicolor-icon-theme' 'luajit')
-makedepends=('cmake')
-install=minetest.install
-source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
-   
${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver})
-sha256sums=('05d15c8e2c8e53ee9d3006e79c2b59200311a7b879220d8b6f6a6fd2acf806b6'
-'7624a1e64124c4438256719ccecfc44fe5139733a076394aedad1f785e50019f')
+makedepends=('sqlite' 'freetype2' 'leveldb' 'openal' 'libvorbis' 'curl' 
'irrlicht'
+ 'hicolor-icon-theme' 'luajit' 'cmake')
+source=(https://github.com/minetest/minetest/archive/$pkgver.tar.gz
+
data-$pkgver.tar.gz::https://github.com/minetest/minetest_game/archive/$pkgver.tar.gz)
+md5sums=('61bb35c9d5521f1b072bc3c3e634c863'
+ '398d83431c44fb85f02bd902b016338c')
 
+prepare() {
+  install -d build-{client,server}
+}
+
 build() {
-  cd $srcdir/minetest-minetest-*
-
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr \
--DENABLE_GETTEXT=on \
+  cd $srcdir/build-client
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_SERVER=0 \
+-DENABLE_GETTEXT=1 \
 -DENABLE_FREETYPE=1 \
--DENABLE_LEVELDB=on \
+-DENABLE_LEVELDB=0 \
+-DENABLE_REDIS=0 \
 -DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
 -DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
   make
+
+  cd $srcdir/build-server
+  cmake ../$pkgname-$pkgver \
+-DCMAKE_INSTALL_PREFIX=/usr \
+-DBUILD_CLIENT=0 \
+-DENABLE_LEVELDB=1 \
+-DENABLE_REDIS=1 \
+-DLUA_INCLUDE_DIR=/usr/include/luajit-2.0 \
+-DLUA_LIBRARY=//usr/lib/libluajit-5.1.so.2
+  make
 }
 
-package() {
-  cd $srcdir/minetest-minetest-*
+package_minetest() {
+  pkgdesc='Multiplayer infinite-world block sandbox game'
+  depends=('minetest-common' 'irrlicht' 'curl' 'luajit' 'libvorbis' 'sqlite'
+   'openal' 'hicolor-icon-theme' 'desktop-file-utils' 'xdg-utils')
+  install=minetest.install
 
+  cd build-client
   make DESTDIR=$pkgdir install
+  cp -r locale $pkgdir/usr/share/
 
-  mv -v $srcdir/minetest-minetest_game-* 
$pkgdir/usr/share/minetest/games/minetest
-  
-  # small cleanup
+  rm -rf $pkgdir/usr/share/minetest
+  rm $pkgdir/usr/share/man/man6/minetestserver.6
+}
+
+package_minetest-server() {
+  pkgdesc='Server of infinite-world block sandbox game'
+  depends=('minetest-common' 'leveldb' 'luajit' 'curl' 'sqlite')
+
+  cd build-server
+  make DESTDIR=$pkgdir install
+
+  rm -rf $pkgdir/usr/share/{minetest,appdata,applications,icons,doc}
+  rm $pkgdir/usr/share/man/man6/minetest.6
+}
+
+package_minetest-common() {
+  pkgdesc='Common data files for minetest and minetest-server'
+
+  cd $pkgbase-$pkgver
+  install -d $pkgdir/usr/share/minetest
+
+  cp -r games builtin client fonts textures $pkgdir/usr/share/minetest/
+  cp -r $srcdir/minetest_game-$pkgver 
$pkgdir/usr/share/minetest/games/minetest
   rm $pkgdir/usr/share/minetest/games/minetest/.gitignore
 }

Modified: minetest.install
===
--- minetest.install2014-08-22 07:46:47 UTC (rev 117746)
+++ minetest.install2014-08-22 08:44:21 UTC (rev 117747)
@@ -1,17 +1,12 @@
 post_install() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor  /dev/null 21
-  update-desktop-database  /dev/null 21
+  xdg-icon-resource forceupdate --theme hicolor  /dev/null
+  update-desktop-database /dev/null
 }
 
 post_upgrade() {
-  post_install $1
+  post_install
 }
 
-pre_remove() {
-  update-desktop-database  /dev/null 21
-}
-
 post_remove() {
-  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor  /dev/null 21 
-  update-desktop-database  /dev/null 21
+  post_install
 }

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

2013-06-02 Thread Laurent Carlier 
Date: Sunday, June 2, 2013 @ 14:00:20
  Author: lcarlier
Revision: 92173

upgpkg: minetest 0.4.6-1

Moved from AUR and updated/cleanup

Added:
  minetest/trunk/minetest.install
Modified:
  minetest/trunk/PKGBUILD

--+
 PKGBUILD |5 +++--
 minetest.install |   17 +
 2 files changed, 20 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-02 11:16:42 UTC (rev 92172)
+++ PKGBUILD2013-06-02 12:00:20 UTC (rev 92173)
@@ -9,8 +9,9 @@
 arch=('i686' 'x86_64')
 url='http://minetest.net/'
 license=('GPL')
-depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'gcc-libs' 
'hicolor-icon-theme')
+depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 
'hicolor-icon-theme')
 makedepends=('cmake' 'irrlicht' 'mesa' 'libpng' 'zlib')
+install=minetest.install
 
source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}

${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}
 
${pkgname}_common-${pkgver}.tar.gz::https://github.com/minetest/common/tarball/${pkgver})
@@ -31,7 +32,7 @@
   make DESTDIR=$pkgdir install
 
   mv -v $srcdir/minetest-minetest_game-* 
$pkgdir/usr/share/minetest/games/minetest
-  mv -v $srcdir/common-* $pkgdir/usr/share/minetest/games/common
+  mv -v $srcdir/minetest-common-* $pkgdir/usr/share/minetest/games/common
   
   # small cleanup
   rm $pkgdir/usr/share/minetest/games/{minetest,common}/.gitignore

Added: minetest.install
===
--- minetest.install(rev 0)
+++ minetest.install2013-06-02 12:00:20 UTC (rev 92173)
@@ -0,0 +1,17 @@
+post_install() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor  /dev/null 21
+  update-desktop-database  /dev/null 21
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  update-desktop-database  /dev/null 21
+}
+
+post_remove() {
+  gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor  /dev/null 21 
+  update-desktop-database  /dev/null 21
+}