Remove erroneously empty /var/run directory within package (not on system itself), created by most recent version, causes installation conflict.

2 files changed, 7 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 66686f9230a1..765d856046ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Dec 14 01:24:27 UTC 2015
+# Sun Dec 20 01:43:06 UTC 2015
 pkgbase = infiniband-diags
 	pkgdesc = OpenFabrics Alliance diagnostic programs and scripts for InfiniBand subnets
 	pkgver = 1.6.6
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.openfabrics.org/index.php/overview.html
 	arch = x86_64
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 0f06f45e03f5..4af0cdcb3997 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=infiniband-diags
 pkgver=1.6.6
-pkgrel=1
+pkgrel=2
 pkgdesc='OpenFabrics Alliance diagnostic programs and scripts for InfiniBand subnets'
 arch=('x86_64' 'i686')
 url=('https://www.openfabrics.org/index.php/overview.html')
@@ -34,4 +34,8 @@ package() {
   # Convert from init.d to systemd
   rm -rf ${pkgdir}/etc/init.d
   install -Dm644 "${srcdir}/rdma-ndd.service" "${pkgdir}/usr/lib/systemd/system/rdma-ndd.service"
+
+  # 1.6.6 erroneously makes an empty /var/run directory - remove /var/runa nd /var with rmdir rather than "rm -r" so it will fail if not empty (future versions)
+  rmdir "${pkgdir}/var/run"
+  rmdir "${pkgdir}/var"
 }