Fix some stuff (pkgrel 2)

3 files changed, 19 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3dbac16bccf9..61702f91291f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Tue Jul 12 22:53:04 UTC 2016
+# Mon Aug 29 08:59:22 UTC 2016
 pkgbase = lib32-smbclient
 	pkgdesc = Tools to access a server's filespace and printers via SMB
 	pkgver = 4.4.5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.samba.org
 	arch = x86_64
 	license = GPL3
@@ -22,10 +22,10 @@ pkgbase = lib32-smbclient
 	makedepends = lib32-tevent
 	makedepends = lib32-ldb
 	makedepends = lib32-libarchive
+	makedepends = lib32-libaio
+	makedepends = perl-parse-yapp
 	source = http://us1.samba.org/samba/ftp/stable/samba-4.4.5.tar.gz
-	source = libsystemd.patch
 	md5sums = 6950c5e9f7bdeb8a610c2ca957a15be4
-	md5sums = ab4d156dd6be268aaf462fbd7f40a55b
 
 pkgname = lib32-libwbclient
 	pkgdesc = Samba winbind client library
@@ -45,5 +45,7 @@ pkgname = lib32-smbclient
 	depends = lib32-tdb
 	depends = lib32-ldb
 	depends = lib32-python2
+	depends = lib32-libaio
+	depends = perl-parse-yapp
 	depends = smbclient
 
diff --git a/PKGBUILD b/PKGBUILD
index ada386a0a972..5aac5cac663c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,24 +4,18 @@
 pkgbase=lib32-smbclient
 pkgname=('lib32-libwbclient' 'lib32-smbclient')
 pkgver=4.4.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Tools to access a server's filespace and printers via SMB"
 arch=('x86_64')
 url='http://www.samba.org'
 license=('GPL3')
-makedepends=('lib32-avahi' 'lib32-gnutls' 'lib32-libbsd' 'lib32-libcap' \
-             'lib32-libcups' 'lib32-libgcrypt' 'lib32-pam' 'lib32-python2' \
-             'lib32-systemd' 'lib32-talloc' 'lib32-tdb' 'lib32-popt' \
-             'lib32-tevent' 'lib32-ldb' 'lib32-libarchive')
-source=("http://us1.samba.org/samba/ftp/stable/samba-${pkgver}.tar.gz"
-        'libsystemd.patch')
-md5sums=('6950c5e9f7bdeb8a610c2ca957a15be4'
-         'ab4d156dd6be268aaf462fbd7f40a55b')
-
-prepare() {
-  cd samba-${pkgver}
-  patch -Np1 -i ../libsystemd.patch
-}
+makedepends=('lib32-avahi' 'lib32-gnutls' 'lib32-libbsd' 'lib32-libcap'
+             'lib32-libcups' 'lib32-libgcrypt' 'lib32-pam' 'lib32-python2'
+             'lib32-systemd' 'lib32-talloc' 'lib32-tdb' 'lib32-popt'
+             'lib32-tevent' 'lib32-ldb' 'lib32-libarchive' 'lib32-libaio'
+             'perl-parse-yapp')
+source=("http://us1.samba.org/samba/ftp/stable/samba-${pkgver}.tar.gz")
+md5sums=('6950c5e9f7bdeb8a610c2ca957a15be4')
 
 build() {
   cd samba-${pkgver}
@@ -52,7 +46,7 @@ $(find ${srcdir}/samba-${pkgver}/source4/scripting -type f)"
   ./configure \
     --prefix='/usr' \
     --libdir='/usr/lib32' \
-    --libexecdir='/usr/lib32' \
+    --libexecdir='/usr/lib32/samba' \
     --localstatedir='/var' \
     --sbindir='/usr/bin' \
     --enable-fhs \
@@ -86,9 +80,10 @@ package_lib32-libwbclient() {
 }
 
 package_lib32-smbclient() {
-  depends=('lib32-avahi' 'lib32-gnutls' 'lib32-libcap' 'lib32-libcups' \
-           'lib32-libgcrypt' 'lib32-libwbclient' 'lib32-pam' 'lib32-systemd' \
-           'lib32-talloc' 'lib32-tdb' 'lib32-ldb' 'lib32-python2' 'smbclient')
+  depends=('lib32-avahi' 'lib32-gnutls' 'lib32-libcap' 'lib32-libcups'
+           'lib32-libgcrypt' 'lib32-libwbclient' 'lib32-pam' 'lib32-systemd'
+           'lib32-talloc' 'lib32-tdb' 'lib32-ldb' 'lib32-python2'
+           'lib32-libaio' 'perl-parse-yapp' 'smbclient')
 
   cd staging
 
diff --git a/libsystemd.patch b/libsystemd.patch
deleted file mode 100644
index 002401e246ca..000000000000
--- a/libsystemd.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -u -r samba-4.4.0/lib/util/wscript_configure samba-4.4.0-libsystemd/lib/util/wscript_configure
---- samba-4.4.0/lib/util/wscript_configure	2016-01-26 12:45:46.000000000 +0100
-+++ samba-4.4.0-libsystemd/lib/util/wscript_configure	2016-03-22 15:24:35.308586071 +0100
-@@ -110,16 +110,23 @@
- conf.SET_TARGET_TYPE('systemd', 'EMPTY')
- 
- if Options.options.enable_systemd != False:
--    conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs',
--                   msg='Checking for libsystemd-daemon')
--    if not conf.CHECK_LIB('systemd-daemon', shlib=True):
--        conf.CHECK_LIB('systemd', shlib=True)
-+    conf.CHECK_CFG(package='libsystemd', args='--cflags --libs',
-+                   msg='Checking for libsystemd', uselib_store='SYSTEMD')
-+    conf.CHECK_HEADERS('systemd/sd-daemon.h systemd/sd-journal.h', lib='systemd')
-+    conf.CHECK_LIB('systemd', shlib=True)
- 
--if Options.options.enable_systemd != False:
--    conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs',
--                   msg='Checking for libsystemd-journal')
--    if not conf.CHECK_LIB('systemd-journal', shlib=True):
--        conf.CHECK_LIB('systemd', shlib=True)
-+    if conf.CONFIG_SET('HAVE_LIBSYSTEMD'):
-+        conf.DEFINE('HAVE_LIBSYSTEMD_DAEMON', '1')
-+        conf.DEFINE('HAVE_LIBSYSTEMD_JOURNAL', '1')
-+    else:
-+        conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs',
-+                       msg='Checking for libsystemd-daemon', uselib_store='SYSTEMD_DAEMON')
-+        conf.CHECK_HEADERS('systemd/sd-daemon.h', lib='systemd-daemon')
-+        conf.CHECK_LIB('systemd-daemon', shlib=True)
-+        conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs',
-+                       msg='Checking for libsystemd-journal', uselib_store='SYSTEMD_JOURNAL')
-+        conf.CHECK_HEADERS('systemd/sd-journal.h', lib='systemd-journal')
-+        conf.CHECK_LIB('systemd-journal', shlib=True)
- 
- if Options.options.enable_lttng != False:
-     conf.CHECK_CFG(package='lttng-ust', args='--cflags --libs',