summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-12-11 19:41:37 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-12-11 19:41:37 -0500
commit4af2701db8813ccc17ded58dace627d216dbb9c7 (patch)
tree30d3b69424041dc43c174bc1edd1132c074d4233
parentc344581443759d7377c4b5ae4980e1a5901ab231 (diff)
update libre/parabolaweb-utils
-rw-r--r--libre/parabolaweb-utils/PKGBUILD19
-rw-r--r--libre/parabolaweb-utils/helper.sh32
2 files changed, 20 insertions, 31 deletions
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index 5fdd12bdb..e3d9444ce 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -1,14 +1,13 @@
# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-. helper.sh
+. "${startdir:-.}/helper.sh"
# provides:
-# _get_pkgver
# _get_depends
# _get_depends_nover (no version requirements)
pkgname=parabolaweb-utils
-pkgver=`_get_pkgver`
-pkgrel=8
+pkgver=20121115.1554
+pkgrel=1
pkgdesc="Utils for the Parabola website"
arch=('any')
url="https://projects.parabolagnulinux.org/parabolaweb.git/"
@@ -20,11 +19,8 @@ depends=(
'git' # used in parabolaweb-download
'libretools' # used in parabolaweb-{download,update} (libremessages)
`_get_depends`)
-backup=('etc/conf.d/parabolaweb')
-
-export pkgver
-
makedepends=(makepkg-git)
+backup=('etc/conf.d/parabolaweb')
source=(git://parabolagnulinux.org/parabolaweb.git
parabolaweb-download
@@ -34,6 +30,13 @@ source=(git://parabolagnulinux.org/parabolaweb.git
parabolaweb.service
parabolaweb.conf)
+pkgver() {
+ cd "$srcdir/parabolaweb"
+ # get the date requirements_prod.txt was last modified
+ gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
+ date -u +%Y%m%d.%H%M -d "$gitdate"
+}
+
build() {
:
}
diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh
index 5ce4182b3..5212571a8 100644
--- a/libre/parabolaweb-utils/helper.sh
+++ b/libre/parabolaweb-utils/helper.sh
@@ -1,35 +1,21 @@
_mksource() {
- if [[ -z _DO_NOT_RUN_MKSOURCE ]]; then
- _DO_NOT_RUN_MKSOURCE=true makepkg -o
- fi
-}
-
-_get_pkgver() {
- if [[ -n $pkgver ]] && [[ $pkgver != 0.bogus ]]; then
- echo $pkgver
- else
- _mksource 1>&2
- if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
- pushd "${srcdir:-src}/parabolaweb" >/dev/null
- # get the date requirements_prod.txt was last modified
- gitdate="$(git log -n1 --date=iso --format=format:'%cd' ./requirements_prod.txt)"
- date -u +%Y%m%d.%H%M -d "$gitdate"
- popd >/dev/null
- else
- echo 0.bogus
- fi
+ pushd "${startdir:-.}" >/dev/null
+ if [[ -z $_DO_NOT_RUN_MKSOURCE && $0 =~ ^makepkg ]]; then
+ local flags=(-o)
+ (( EUID )) || flags+=(--asroot)
+ _DO_NOT_RUN_MKSOURCE=true "${0}" "${flags[@]}"
fi
+ popd >/dev/null
}
_get_depends() {
_mksource 1>&2
- if [[ -f "${srcdir:-src}/parabolaweb/requirements_prod.txt" ]]; then
+ if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then
pushd "${srcdir:-src}" >/dev/null
- python2_packages='markdown|psycopg2|pyinotify|pytz|south'
< parabolaweb/requirements_prod.txt sed -r \
-e 's/.*/\L&/' -e 's/==/=/' \
- -e 's/^python-memcached/python2-memcached/' \
- -e "s/^(${python2_packages})/python2-&/"
+ -e 's/^(python2?-)?/python2-/' \
+ -e 's/python2-django/django/'
popd >/dev/null
fi
}