[arch-commits] Commit in freeorion/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Monday, July 8, 2013 @ 19:19:06
  Author: arodseth
Revision: 93709

boost todo

Modified:
  freeorion/trunk/PKGBUILD

----------+
 PKGBUILD |   41 ++++++++++++++++++++---------------------
 1 file changed, 20 insertions(+), 21 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-07-08 14:58:25 UTC (rev 93708)
+++ PKGBUILD	2013-07-08 17:19:06 UTC (rev 93709)
@@ -8,7 +8,7 @@
 
 pkgname=freeorion
 pkgver=0.4.2
-pkgrel=4
+pkgrel=5
 pkgdesc='Turn-based galactic conquest game inspired by Master of Orion'
 arch=('x86_64' 'i686')
 url='http://www.freeorion.org/'
@@ -26,36 +26,35 @@
 install=$pkgname.install
 source=("$pkgname.sh"
         "$pkgname.png::https://a.fsdn.com/con/icons/fr/freeorion@sf.net/FO_Icon_256x256.png"
-        "cmake_python.patch")
+        "cmake_python.patch"
+        "$pkgname::svn+https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/#revision=6142")
 sha256sums=('111532e460aec847ff455ee67dd64f46e2fa5ceba39a0349d25a84b69c646eaf'
             'a6a253eed31b77b00bf4f721f4b1c6bbd95505b9e4b38b736101e551dd12ff5f'
-            '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a')
-_svnrepo='https://freeorion.svn.sourceforge.net/svnroot/freeorion/trunk/FreeOrion/'
+            '3dbe8df9c3a4a0d6451f42727ebf9bcb21fed41a08d1181d1cf77ef4ab5ee81a'
+            'SKIP')
 _pyversion=2.7
-_revision=5771
 
+pkgver() {
+  cd "$pkgname"
+
+  svnversion | tr -d [A-z]
+}
+
+prepare() {
+  cd "$pkgname"
+
+  svn upgrade
+}
+
 build() {
   cd "$srcdir"
-  gendesk -n
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc"
 
   #msg2 'Looking up revision from version number...'
   #_releaserevision=`curl --progress-bar -o- ${url}index.php/Compile | grep "$pkgver" | cut -d':' -f2 | cut -d' ' -f10 | tail -1`
-  #msg2 'The revision for the latest official release is $_releaserevision"
-  ## _revision=$_releaserevision
-  #msg2 "Compiling with revision $_revision"
 
-  msg2 "Checking out svn revision $_revision..."
-  if [[ -d "$pkgname/.svn" ]]; then
-    (cd "$pkgname" && svn up -r "$_revision")
-  else
-    svn co "$_svnrepo" --config-dir ./ -r "$_revision" "$pkgname"
-  fi
+  cd "$srcdir/$pkgname"
 
-  msg2 'Setting up build directory...'
-  rm -rf "$srcdir/$pkgname-build"
-  cp -r "$srcdir/$pkgname" "$srcdir/$pkgname-build"
-  cd "$srcdir/$pkgname-build"
-
   msg2 'CMake/Python fix...'
   patch -N -p1 -i "$srcdir/cmake_python.patch"
 
@@ -81,7 +80,7 @@
 }
 
 package() {
-  cd "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname"
 
   msg2 'Packaging documentation...'
   install -Dm644 loki_setup/README.txt \