summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD29
2 files changed, 36 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index db6088bb4bdf..3e81547203f0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,13 +7,22 @@ pkgbase = django
url = http://www.djangoproject.com/
arch = any
license = BSD
+ makedepends = python2
makedepends = python2-distribute
- depends = python2
- optdepends = mysql-python: for MySQL backend
- optdepends = python2-psycopg2: for PostgreSQL backend
+ makedepends = python
+ makedepends = python-distribute
source = https://www.djangoproject.com/m/releases/1.5/Django-1.5.tar.gz
md5sums = fac09e1e0f11bb83bb187d652a9be967
sha256sums = 078bf8f8ab025ed79e41ed5cee145a64dffea638eb5c2928c8cd106720824416
-pkgname = django
+pkgname = python-django
+ depends = python
+ optdepends = python-psycopg2: for PostgreSQL backend
+
+pkgname = python2-django
+ depends = python2
+ optdepends = mysql-python: for MySQL backend
+ optdepends = python2-psycopg2: for PostgreSQL backend
+ conflicts = django
+ replaces = django
diff --git a/PKGBUILD b/PKGBUILD
index d12fd42e53b8..943572195942 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,15 @@
# Maintainer: Dan McGee <dan@archlinux.org>
# Contributor: Shahar Weiss <sweiss4@gmx.net>
-pkgname=django
+pkgbase=django
+pkgname=('python-django' 'python2-django')
pkgver=1.5
pkgrel=1
pkgdesc="A high-level Python Web framework that encourages rapid development and clean design"
arch=('any')
license=('BSD')
url="http://www.djangoproject.com/"
-depends=('python2')
-makedepends=('python2-distribute')
-optdepends=('mysql-python: for MySQL backend'
- 'python2-psycopg2: for PostgreSQL backend')
+makedepends=('python2' 'python2-distribute' 'python' 'python-distribute')
source=("https://www.djangoproject.com/m/releases/${pkgver:0:3}/Django-$pkgver.tar.gz")
md5sums=('fac09e1e0f11bb83bb187d652a9be967')
sha256sums=('078bf8f8ab025ed79e41ed5cee145a64dffea638eb5c2928c8cd106720824416')
@@ -22,10 +20,29 @@ build() {
python2 setup.py build
}
-package() {
+package_python-django() {
+ depends=('python')
+ optdepends=('python-psycopg2: for PostgreSQL backend')
+ cd "$srcdir/Django-$pkgver"
+ python setup.py install --root="$pkgdir" --optimize=1
+
+ mv "$pkgdir"/usr/bin/django-admin.py "$pkgdir"/usr/bin/django-admin3.py
+ install -Dm644 extras/django_bash_completion \
+ "$pkgdir"/usr/share/bash-completion/completions/django-admin3.py
+
+ install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+}
+
+package_python2-django() {
+ depends=('python2')
+ optdepends=('mysql-python: for MySQL backend'
+ 'python2-psycopg2: for PostgreSQL backend')
+ replaces=('django')
+ conflicts=('django')
cd "$srcdir/Django-$pkgver"
python2 setup.py install --root="$pkgdir" --optimize=1
+ ln -s django-admin.py "$pkgdir"/usr/bin/django-admin2.py
install -Dm644 extras/django_bash_completion \
"$pkgdir"/usr/share/bash-completion/completions/django-admin.py
ln -s django-admin.py \