aur updates

aur/python-configshell-fb/PKGBUILD

@@ -1,19 +1,19 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net 
 pkgname=('python-configshell-fb' 'python2-configshell-fb')
 _pkgname=configshell-fb
-pkgver=1.1.fb15
-pkgrel=3
+pkgver=1.1.fb16
+pkgrel=1
 pkgdesc="python framework for building simple CLI applications (free branch)"
-makedepends=('python-setuptools' 'python2-setuptools')
 arch=('any')
 url="https://github.com/agrover/configshell-fb"
 license=('Apache')
 options=()
 source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz)
-sha256sums=('7e645509acff3e92d4b824be48cdca1ba059e94ae9f9e0bdedd5829c310518d9')
+sha256sums=('391187e213bcec4eb81d34baad973afd6ff544af1fe07816ff784a3eb278e0c5')
 
 package_python-configshell-fb() {
   depends=('python-pyparsing' 'python-urwid')
+  makedepends=('python-setuptools')
   provides=('python-configshell')
   conflicts=('python-configshell')
   cd "$srcdir/$_pkgname-$pkgver"
@@ -22,6 +22,7 @@ package_python-configshell-fb() {
 
 package_python2-configshell-fb() {
   depends=('python2-pyparsing' 'python2-urwid')
+  makedepends=('python2-setuptools')
   provides=('python2-configshell')
   conflicts=('python2-configshell')
   cd "$srcdir/$_pkgname-$pkgver"

aur/python-rtslib-fb/PKGBUILD

@@ -1,32 +1,29 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
-pkgname=python-rtslib-fb
+pkgname=('python-rtslib-fb' 'python2-rtslib-fb')
 _pkgname=rtslib-fb
-pkgver=2.1.fb50
+pkgver=2.1.fb51
 pkgrel=1
 pkgdesc="free branch version of the LIO target API"
 arch=('any')
 url="https://github.com/agrover/rtslib-fb"
 license=('Apache')
 depends=()
-makedepends=('python-setuptools')
-# this is incompatible to python2-rtslib
 provides=()
-conflicts=('python2-rtslib' 'targetcli-fb<=2.1.fb31')
 backup=()
 options=()
 install=
 source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$_pkgname-$pkgver.tar.gz target.service)
-sha256sums=('8a5ed44fc42e7a1f136db9eebb67d4cdc22ba3ba7a675f7af756bb2b550b4dad'
+sha256sums=('a28bf567ee451952c7f03b9dbc962ba81cc2a22ed3a8a0c8df1b3ce9cc5f67b8'
             '74b9e5c11eab1781aa8b43680b429080ae800fbcdafd29626791b5426a4cdea8')
 
-build() {
-  cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py build
-}
 
-package() {
+package_python-rtslib-fb() {
+  depends=('python')
+  makedepends=('python-setuptools')
+  conflicts=('python2-rtslib' 'targetcli-fb<=2.1.fb31')
+
   cd "$srcdir/$_pkgname-$pkgver"
-  python setup.py install --skip-build --root="$pkgdir/" --optimize=1
+  python setup.py install --root="$pkgdir/" --optimize=1
 
   install -Dm 644 doc/targetctl.8 "$pkgdir/usr/share/man/man8/targetctl.8"
   install -Dm 644 doc/saveconfig.json.5 "$pkgdir/usr/share/man/man5/saveconfig.json.5"
@@ -40,4 +37,15 @@ package() {
   cp target.service "$pkgdir/usr/lib/systemd/system/"
 }
 
+package_python2-rtslib-fb() {
+  depends=('python2')
+  makedepends=('python2-setuptools')
+  conflicts=('python2-rtslib')
+
+  cd "$srcdir/$_pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+  # the service file and targetctl script is in python-rtslib-fb
+  rm -r "$pkgdir/usr/bin"
+}
+
 # vim:set ts=2 sw=2 et:

aur/targetcli-fb/PKGBUILD

@@ -1,13 +1,13 @@
 # Contributor: Johannes Dewender  arch at JonnyJD dot net
 pkgname=targetcli-fb
-pkgver=2.1.fb37
+pkgver=2.1.fb38
 pkgrel=1
 pkgdesc="free branch of the targetcli LIO administration shell (iSCSI + Co)"
 arch=('any')
 url="https://github.com/agrover/targetcli-fb"
 license=('Apache')
 groups=()
-depends=('python-rtslib-fb>=2.1.fb47' 'python-configshell-fb>=1.1.fb12')
+depends=('python-rtslib-fb>=2.1.fb51' 'python-configshell-fb>=1.1.fb12')
 makedepends=('python-setuptools')
 # TODO: optdepend on python-ethtool when available for python3
 optdepends=()
@@ -16,6 +16,7 @@ backup=()
 options=()
 install=
 source=(https://fedorahosted.org/releases/t/a/targetcli-fb/$pkgname-$pkgver.tar.gz)
+sha256sums=('cee85005cf2b4ee88d313843029585ead98b0dd14ae326154a6e2f47baa4ef6d')
 
 
 build() {
@@ -32,4 +33,3 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-sha256sums=('e7d11fa0a01cde443a1689966a62cab3e8a15ea500d03b0f9564b7ac44fa5a65')