From 799962d8b95d931e00bfc679071fd4f49fd406e4 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@plugapps.com>
Date: Sun, 15 Apr 2012 13:09:31 -0400
Subject: [PATCH] aur/python2-rtslib to 2.1-3

---
 aur/python2-rtslib/PKGBUILD         | 27 +++++++++++++++++----------
 aur/python2-rtslib/gz-modules.patch | 14 --------------
 2 files changed, 17 insertions(+), 24 deletions(-)
 delete mode 100644 aur/python2-rtslib/gz-modules.patch

diff --git a/aur/python2-rtslib/PKGBUILD b/aur/python2-rtslib/PKGBUILD
index ce5d2a1a2..07b7b6e24 100644
--- a/aur/python2-rtslib/PKGBUILD
+++ b/aur/python2-rtslib/PKGBUILD
@@ -1,27 +1,34 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
-# Contributor: Kevin Mihelich <kevin@plugapps.com>
 
 plugrel=1
 
 pkgname=python2-rtslib
-_pkgname=rtslib
 pkgver=2.1
-pkgrel=2
+pkgrel=3
+epoch=
 pkgdesc="RisingTide Systems generic SCSI target API in python"
 arch=('any')
 url="http://www.risingtidesystems.com/git/?p=rtslib.git;a=summary"
 license=('AGPL3')
-depends=('python2-ipaddr' 'python2-netifaces' 'python-configobj')
-source=("http://archlinuxarm.org/builder/src/$_pkgname-$pkgver.tgz"
-        'gz-modules.patch')
-md5sums=('144863bf1e74e60fa66794950d28edde'
-         'c0cf6b8ca9c2f12f701e99c011d2ba03')
+depends=('python2-ipaddr' 'python-netifaces' 'python-configobj')
+provides=()
+conflicts=()
+backup=()
+options=()
+install=
+source=('gz-modules-upstream.patch')
+md5sums=('4add05b9cbd12258dc993f19728fbafe')
+
+_pkgname=rtslib
 
 build() {
-  cd "$srcdir"
-  patch -p0 < gz-modules.patch
+  if [ ! -e "$_pkgname-$pkgver.tgz" ]; then
+    wget "http://www.risingtidesystems.com/git/?p=$_pkgname.git;a=snapshot;h=c4ba14ff21f68e56d6a3a227a0220d1a6b6df958;sf=tgz" -O "$_pkgname-$pkgver.tgz"
+  fi
+  bsdtar -xf "$srcdir/$_pkgname-$pkgver.tgz"
 
   cd "$srcdir/$_pkgname"
+  patch -p1 < ../gz-modules-upstream.patch
   python2 setup.py build
 }
 
diff --git a/aur/python2-rtslib/gz-modules.patch b/aur/python2-rtslib/gz-modules.patch
deleted file mode 100644
index 7b291f452..000000000
--- a/aur/python2-rtslib/gz-modules.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-also find gzipped modules
---- rtslib/rtslib/utils.py	2011-10-06 00:46:09.000000000 +0200
-+++ rtslib/rtslib/utils.py	2011-10-06 01:36:26.000000000 +0200
-@@ -604,8 +604,8 @@
-     '''
-     kver = os.uname()[2]
-     depfile = "/lib/modules/%s/modules.dep" % kver
--    return [module.split(".")[0] for module in
--            re.findall(r"[a-zA-Z0-9_-]+\.ko:", fread(depfile))]
-+    return [module[0] for module in
-+            re.findall(r"([a-zA-Z0-9_-]+)\.ko(.gz)?:", fread(depfile))]
- 
- def list_loaded_kernel_modules():
-     '''