summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Swanson2015-10-15 22:24:29 -0700
committerMike Swanson2015-10-15 22:25:42 -0700
commite90b0a1dfb8db70d50061d4fb1bb8751c62756e0 (patch)
tree866df4fad1c04d74950f9f8fd94980d2a6e012d6
parent10d982c2d69179eefdae48dd6c286585c4ce8e38 (diff)
downloadaur-e90b0a1dfb8db70d50061d4fb1bb8751c62756e0.tar.gz
Bring up-to-date with the release version of the package
-rw-r--r--.SRCINFO14
-rw-r--r--.gitignore5
-rw-r--r--PKGBUILD53
3 files changed, 48 insertions, 24 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eedb979c417..12ff919d591 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,23 @@
pkgbase = minecraft-overviewer-git
pkgdesc = Render large resolution images of a Minecraft map with a Google Maps powered interface
- pkgver = 0.11.0.10.gcbd76d8
+ pkgver = 0.12.0.r81.0ba0c60
pkgrel = 1
url = https://github.com/overviewer/Minecraft-Overviewer
arch = x86_64
arch = i686
- license = GPL
+ license = GPL3
makedepends = git
+ makedepends = python2-sphinx
depends = python2
- depends = python-imaging
+ depends = python2-pillow
depends = python2-numpy
provides = minecraft-overviewer
conflicts = minecraft-overviewer
- source = minecraft-overviewer-git::git://github.com/overviewer/Minecraft-Overviewer.git
- md5sums = SKIP
+ source = git+https://github.com/overviewer/Minecraft-Overviewer.git
+ sha256sums = SKIP
pkgname = minecraft-overviewer-git
+pkgname = minecraft-overviewer-docs-git
+ arch = any
+
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..c6b470aa1c2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+*.pkg.tar*
+*.src.tar*
+/Minecraft-Overviewer/
+src
+pkg
diff --git a/PKGBUILD b/PKGBUILD
index cd3b10fb108..15b1830adc9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,46 @@
-# Maintainer: Buce <dmbuce@gmail.com>
+# Maintainer: Mike Swanson <mikeonthecomputer@gmail.com>
+# Contributor: Buce <dmbuce@gmail.com>
# Contributor: Duncan Bain <duncanjbain@gmail.com>
# Contributor: Maxwell Pray a.k.a. Synthead <synthead@gmail.com>
-pkgname=minecraft-overviewer-git
-pkgver=0.11.0.10.gcbd76d8
-pkgver() {
- cd "$srcdir/$pkgname"
- git describe --tags --match 'v*.*.*' | sed 's/^v//; s/-/./g'
-}
+_pkgname=Minecraft-Overviewer
+pkgname=(${_pkgname,,}{,-docs}-git)
+pkgver=0.12.0.r81.0ba0c60
pkgrel=1
pkgdesc="Render large resolution images of a Minecraft map with a Google Maps powered interface"
arch=('x86_64' 'i686')
-url="https://github.com/overviewer/Minecraft-Overviewer"
-license=('GPL')
-depends=('python2' 'python-imaging' 'python2-numpy')
-makedepends=('git')
+url="https://github.com/overviewer/${_pkgname}"
+license=('GPL3')
+depends=('python2' 'python2-pillow' 'python2-numpy')
+makedepends=('git' 'python2-sphinx')
conflicts=('minecraft-overviewer')
provides=('minecraft-overviewer')
-source=("$pkgname::git://github.com/overviewer/Minecraft-Overviewer.git")
-md5sums=(SKIP)
+source=("git+https://github.com/overviewer/${_pkgname}.git")
+sha256sums=('SKIP')
+
+pkgver() {
+ cd "${_pkgname}"
+ local version="$(git describe --long --tags | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
+ printf "%s" "${version#v}"
+}
build() {
- cd "$srcdir/$pkgname"
- python2 "setup.py" build
+ cd "${_pkgname}"
+ python2 "setup.py" build
+
+ cd ./docs
+ make SPHINXBUILD=sphinx-build2 html
+}
+
+package_minecraft-overviewer-git() {
+ cd "${_pkgname}"
+ python2 "setup.py" install --prefix=/usr --root="$pkgdir"
}
-package() {
- cd "$srcdir/$pkgname"
- python2 "setup.py" install --prefix="$pkgdir/usr"
-}
+package_minecraft-overviewer-docs-git() {
+ arch=('any')
+ cd "${_pkgname}/docs/_build/html"
+
+ install -d "$pkgdir/usr/share/doc/${_pkgname,,}/html"
+ cp -r -t "$pkgdir/usr/share/doc/${_pkgname,,}/html" -- *
+}