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

[Alexander Rødseth]

    Date: Sunday, May 25, 2014 @ 12:39:00
  Author: arodseth
Revision: 111822

upgpkg: mod_wsgi 3.5-1

Modified:
  mod_wsgi/trunk/PKGBUILD

----------+
 PKGBUILD |   43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-05-25 10:37:22 UTC (rev 111821)
+++ PKGBUILD	2014-05-25 10:39:00 UTC (rev 111822)
@@ -3,31 +3,50 @@
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Ryan Coyner <rcoyner at gmail.com>
 
-pkgname=mod_wsgi
-pkgver=3.4
-pkgrel=4
-pkgdesc='Python WSGI adapter module for Apache'
+pkgbase=mod_wsgi
+pkgname=($pkgbase 'mod_wsgi2')
+pkgver=3.5
+pkgrel=1
+pkgdesc='Python2 WSGI adapter module for Apache'
 arch=('x86_64' 'i686')
 url='http://www.modwsgi.org/'
 license=('APACHE')
-depends=('apache' 'python')
-install=mod_wsgi.install
-source=("http://modwsgi.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('ae85c98e9e146840ab3c3e4490e6774f9bef0f99b9f679fca786b2adb5b4b6e8')
+makedepends=('apache' 'python' 'python2')
+install='mod_wsgi.install'
+source=("https://github.com/GrahamDumpleton/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('f0674c38f0f568ece55610bcc6a775c179835c4cba23aa7f876d2a2a8520bf93')
 
 build() {
-  cd "$srcdir/$pkgbase-$pkgver"
+  cp -r "$pkgbase-$pkgver" py2
 
+  # Build the Python 3 version
+  cd "$pkgbase-$pkgver"
   ./configure --prefix=/usr \
     --with-apxs=/usr/bin/apxs \
     --with-python=/usr/bin/python
   make LDLIBS='-lpython3 -lpthread -ldl -lutil -lm'
+
+  # Build the Python 2 version
+  cd "$srcdir/py2"
+  ./configure \
+    --prefix=/usr \
+    --with-apxs=/usr/bin/apxs \
+    --with-python=/usr/bin/python2
+  make
 }
 
-package() {
-  cd "$srcdir/$pkgbase-$pkgver"
+package_mod_wsgi() {
+  pkgdesc='Python WSGI adapter module for Apache'
+  depends=('apache' 'python')
+  conflicts=('mod_wsgi2')
+  make -C "$pkgbase-$pkgver" DESTDIR="$pkgdir" install
+}
 
-  make DESTDIR="$pkgdir" install
+package_mod_wsgi2() {
+  pkgdesc='Python2 WSGI adapter module for Apache'
+  depends=('apache' 'python2')
+  conflicts=('mod_wsgi')
+  make -C py2 DESTDIR="$pkgdir" install
 }
 
 # vim:set ts=2 sw=2 et: