From 1b9faba25721b73f30e49f0cea9c7346eedd0f73 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 14 Dec 2012 03:00:42 -0800 Subject: Fri Dec 14 02:55:25 PST 2012 --- libre/parabolaweb-utils/PKGBUILD | 9 ++++++--- libre/parabolaweb-utils/helper.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) (limited to 'libre/parabolaweb-utils') diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index e3d9444ce..4220394dc 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -6,12 +6,14 @@ # _get_depends_nover (no version requirements) pkgname=parabolaweb-utils -pkgver=20121115.1554 -pkgrel=1 +pkgver=20120425.0657 pkgdesc="Utils for the Parabola website" -arch=('any') url="https://projects.parabolagnulinux.org/parabolaweb.git/" license=('GPL2') + +pkgrel=1 +epoch=1 +arch=('any') depends=( 'python2' # duh 'python2-flup' # for fcgi @@ -19,6 +21,7 @@ depends=( 'git' # used in parabolaweb-download 'libretools' # used in parabolaweb-{download,update} (libremessages) `_get_depends`) +conflicts=('django>=1.5') # hold it at 1.4 makedepends=(makepkg-git) backup=('etc/conf.d/parabolaweb') diff --git a/libre/parabolaweb-utils/helper.sh b/libre/parabolaweb-utils/helper.sh index 5212571a8..ce8638e7e 100644 --- a/libre/parabolaweb-utils/helper.sh +++ b/libre/parabolaweb-utils/helper.sh @@ -13,7 +13,7 @@ _get_depends() { if [[ -f "${srcdir:-${startdir:-.}/src}/parabolaweb/requirements_prod.txt" ]]; then pushd "${srcdir:-src}" >/dev/null < parabolaweb/requirements_prod.txt sed -r \ - -e 's/.*/\L&/' -e 's/==/=/' \ + -e 's/.*/\L&/' -e 's/==/>=/' \ -e 's/^(python2?-)?/python2-/' \ -e 's/python2-django/django/' popd >/dev/null -- cgit v1.2.3-54-g00ecf