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

Dan McGee dan at archlinux.org
Wed Sep 17 13:39:21 UTC 2014


    Date: Wednesday, September 17, 2014 @ 15:39:21
  Author: dan
Revision: 221841

upgpkg: django 1.7-1

Modified:
  django/trunk/PKGBUILD

----------+
 PKGBUILD |   28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-09-17 13:25:18 UTC (rev 221840)
+++ PKGBUILD	2014-09-17 13:39:21 UTC (rev 221841)
@@ -4,7 +4,7 @@
 
 pkgbase=django
 pkgname=('python-django' 'python2-django')
-pkgver=1.6.6
+pkgver=1.7
 pkgrel=1
 pkgdesc="A high-level Python Web framework that encourages rapid development and clean design"
 arch=('any')
@@ -12,8 +12,8 @@
 url="http://www.djangoproject.com/"
 makedepends=('python2' 'python2-setuptools' 'python' 'python-setuptools')
 source=("https://www.djangoproject.com/m/releases/${pkgver:0:3}/Django-$pkgver.tar.gz")
-md5sums=('d14fd332f31799fff39acc0c79e8421c')
-sha256sums=('536cbd54e533ba3563d205f0c91988b24e7d74b8b253d7825e42214b50ba7e90')
+md5sums=('03edab6828119aa9b32b2252d25eb38d')
+sha256sums=('33f781f17f145f79ee8e0b8d753498e0e0188f0b53b2accad4045d623422d5e1')
 
 prepare() {
   cp -a "$srcdir/Django-$pkgver" "$srcdir/Django-$pkgver-python2"
@@ -36,11 +36,14 @@
   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
+  ln -s django-admin.py "$pkgdir"/usr/bin/django-admin3.py
+  ln -s django-admin "$pkgdir"/usr/bin/django-admin3
   install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/usr/share/bash-completion/completions/django-admin3.py
-  sed -i -e "s/django-admin.py/django-admin3.py/g" \
-    "$pkgdir"/usr/share/bash-completion/completions/django-admin3.py
+    "$pkgdir"/usr/share/bash-completion/completions/django-admin.py
+  ln -s django-admin.py \
+    "$pkgdir"/usr/share/bash-completion/completions/django-admin
+  ln -s django-admin.py \
+    "$pkgdir"/usr/share/bash-completion/completions/manage.py
 
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }
@@ -54,11 +57,14 @@
   cd "$srcdir/Django-$pkgver-python2"
   python2 setup.py install --root="$pkgdir" --optimize=1
 
-  ln -s django-admin.py "$pkgdir"/usr/bin/django-admin2.py
+  mv "$pkgdir"/usr/bin/django-admin.py "$pkgdir"/usr/bin/django-admin2.py
+  mv "$pkgdir"/usr/bin/django-admin "$pkgdir"/usr/bin/django-admin2
+  # TODO: this probably won't work due to the `complete` command within not
+  # knowing about modified our exectuable names
   install -Dm644 extras/django_bash_completion \
-    "$pkgdir"/usr/share/bash-completion/completions/django-admin.py
-  ln -s django-admin.py \
-    "$pkgdir"/usr/share/bash-completion/completions/manage.py
+    "$pkgdir"/usr/share/bash-completion/completions/django-admin2.py
+  ln -s django-admin2.py \
+    "$pkgdir"/usr/share/bash-completion/completions/django-admin2
 
   install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }




More information about the arch-commits mailing list