Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

This commit is contained in:
Kevin Mihelich 2013-03-01 00:38:57 +00:00
commit fe6661315c

View file

@ -84,7 +84,6 @@ $(find ${srcdir}/samba-${_realver}/source4/scripting -type f)"
package_libwbclient4() {
pkgdesc="Samba winbind client library"
depends=('glibc' 'libbsd')
replaces=('libwbclient' )
conflicts=('libwbclient')
install -d -m755 ${pkgdir}/usr/lib
@ -106,7 +105,6 @@ package_smbclient4() {
pkgdesc="Tools to access a server's filespace and printers via SMB"
depends=('popt' 'cifs-utils' 'tdb' 'libwbclient4>=4.0.2-1' 'ldb>=1.1.15'
'tevent' 'talloc' 'readline' 'gnutls' 'openldap' 'libcups' 'dnsutils')
replaces=('smbclient' )
conflicts=('smbclient')
_smbclient_bins=('smbclient' 'smbclient4' 'rpcclient' 'smbspool'
'smbtree' 'smbcacls' 'smbcquotas' 'smbget' 'net'
@ -160,8 +158,8 @@ package_samba4() {
pkgdesc="SMB Fileserver and AD Domain server"
depends=('db>=4.7' 'popt' 'libcups' 'libcap>=2.16' 'gamin' 'gnutls>=2.4.1'
'talloc' 'tdb' 'libgcrypt' 'python2' 'smbclient4>=4.0.2-1')
replaces=('samba' 'sambabase4')
conflicts=('samba' 'sambabase4')
replaces=('sambabase4')
conflicts=('samba')
backup=('etc/samba/smb.conf')
# Everything that libwbclient and smbclient didn't install goes