Date: Friday, April 17, 2020 @ 19:31:24 Author: jelle Revision: 380470
upgpkg: samba 4.12.1-1 Resolve FS#66130 by removing libwbclient and adding the libs to smbclient as a split package to circumvent a circular dependency between libwbclient and smbclient. Arch users should be able to live with a marginally smbclient package. Modified: samba/trunk/PKGBUILD ----------+ PKGBUILD | 29 ++++++----------------------- 1 file changed, 6 insertions(+), 23 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-04-17 19:01:01 UTC (rev 380469) +++ PKGBUILD 2020-04-17 19:31:24 UTC (rev 380470) @@ -9,7 +9,7 @@ # Contributor: Dhananjay Sathe <dhananjaysa...@gmail.com> pkgbase=samba -pkgname=('libwbclient' 'smbclient' 'samba') +pkgname=('smbclient' 'samba') pkgver=4.12.1 pkgrel=1 arch=(x86_64) @@ -83,33 +83,14 @@ fi } -package_libwbclient() { - pkgdesc="Samba winbind client library" - depends=('glibc' 'libbsd' 'libtevent.so') - # Use samba-pkg as a staging directory for the split packages - # (This is so RPATHS and symlinks are generated correctly via - # make install, but the otherwise unsplit pieces can be split) - _pkgsrc="${srcdir}"/samba-pkg - install -d -m755 "${pkgdir}"/usr/lib - mv "${_pkgsrc}"/usr/lib/libwbclient*.so* "${pkgdir}"/usr/lib/ - - install -d -m755 "${pkgdir}"/usr/lib/samba - mv "${_pkgsrc}"/usr/lib/samba/libwinbind-client*.so* "${pkgdir}"/usr/lib/samba/ - mv "${_pkgsrc}"/usr/lib/samba/libreplace-samba4.so* "${pkgdir}"/usr/lib/samba/ - - install -d -m755 "${pkgdir}"/usr/lib/pkgconfig - mv "${_pkgsrc}"/usr/lib/pkgconfig/wbclient.pc "${pkgdir}"/usr/lib/pkgconfig/ - - install -d -m755 "${pkgdir}"/usr/include/samba-4.0 - mv "${_pkgsrc}"/usr/include/samba-4.0/wbclient.h "${pkgdir}"/usr/include/samba-4.0/ -} - package_smbclient() { pkgdesc="Tools to access a server's filespace and printers via SMB" -depends=('popt' 'cifs-utils' 'tdb' "libwbclient>=$pkgver" 'ldb' +depends=('popt' 'cifs-utils' 'tdb' 'ldb' 'tevent' 'libgcrypt' 'python' 'talloc' 'readline' 'gnutls' 'libbsd' 'libldap' 'libcups' 'libarchive' 'libnsl' 'jansson' 'libldb.so' 'libtdb.so' 'libtevent.so' 'libreadline.so') +replaces=('libwbclient') +provides=('libwbclient') _smbclient_bins=('smbclient' 'rpcclient' 'smbspool' 'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net' @@ -139,6 +120,7 @@ install -d -m755 "${pkgdir}"/usr/lib/pkgconfig mv "${_pkgsrc}"/usr/lib/pkgconfig/smbclient.pc "${pkgdir}"/usr/lib/pkgconfig/ mv "${_pkgsrc}"/usr/lib/pkgconfig/netapi.pc "${pkgdir}"/usr/lib/pkgconfig/ + mv "${_pkgsrc}"/usr/lib/pkgconfig/wbclient.pc "${pkgdir}"/usr/lib/pkgconfig/ install -d -m755 "${pkgdir}"/usr/share/man/man1 install -d -m755 "${pkgdir}"/usr/share/man/man7 @@ -156,6 +138,7 @@ install -d -m755 "${pkgdir}"/usr/include/samba-4.0 mv "${_pkgsrc}"/usr/include/samba-4.0/libsmbclient.h "${pkgdir}"/usr/include/samba-4.0/ mv "${_pkgsrc}"/usr/include/samba-4.0/netapi.h "${pkgdir}"/usr/include/samba-4.0/ + mv "${_pkgsrc}"/usr/include/samba-4.0/wbclient.h "${pkgdir}"/usr/include/samba-4.0/ mkdir -p "${pkgdir}"/usr/lib/cups/backend ln -sf /usr/bin/smbspool "${pkgdir}"/usr/lib/cups/backend/smb