Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

2 files changed, 31 insertions, 26 deletions

diff --git a/libre/django-countries/PKGBUILD b/libre/django-countries/PKGBUILD
deleted file mode 100644
index 24b667a67..000000000
--- a/libre/django-countries/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=django-countries
-pkgver=1.5
-pkgdesc="Provides a country field for Django models"
-license=('custom:MIT')
-url="http://bitbucket.org/smileychris/django-countries/"
-
-pkgrel=1
-arch=(any)
-depends=('django')
-makedepends=('python2-distribute')
-source=(http://pypi.python.org/packages/source/${pkgname:0:1}/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=(6c65fcc3aa7de065a54cdb619397626d)
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
-  # fix python->python2, and a typo!
-  sed -i 's|python regen[a-z]*\.py|python2 regenerage.py|' */bin/regenerate.py
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  ./setup.py install --root="$pkgdir/" --optimize=1
-}
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
new file mode 100644
index 000000000..a7bd85da1
--- /dev/null
+++ b/libre/python2-django-countries/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=django-countries
+pkgname=python2-$_pkgname
+pkgver=1.5
+pkgdesc="Provides a country field for Django models"
+url="http://bitbucket.org/smileychris/$_pkgname/"
+license=('custom:MIT')
+
+replaces=($_pkgname)
+conflicts=($_pkgname)
+
+pkgrel=2
+arch=(any)
+depends=('python2-django')
+makedepends=('python2-distribute')
+source=(http://pypi.python.org/packages/source/${_pkgname:0:1}/${_pkgname}/${_pkgname}-${pkgver}.tar.gz)
+md5sums=(6c65fcc3aa7de065a54cdb619397626d)
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py */bin/*.py
+  # fix help message: (python2, typo)
+  # "python regenenerate.py" -> "python2 regenerate.py"
+  sed -i 's|python regen[a-z]*\.py|python2 regenerate.py|' */bin/regenerate.py
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+}