Date: Monday, August 29, 2016 @ 06:50:34 Author: tpowa Revision: 274792
strip out _realver, samba uses no a,b,c versioning since ages Modified: samba/trunk/PKGBUILD ----------+ PKGBUILD | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2016-08-29 06:43:08 UTC (rev 274791) +++ PKGBUILD 2016-08-29 06:50:34 UTC (rev 274792) @@ -11,10 +11,6 @@ pkgbase=samba pkgname=('libwbclient' 'smbclient' 'samba') pkgver=4.4.5 -# We use the 'A' to fake out pacman's version comparators. Samba chooses -# to append 'a','b',etc to their subsequent releases, which pacman -# misconstrues as alpha, beta, etc. Bad samba! -_realver=4.4.5 pkgrel=1 arch=(i686 x86_64) url="http://www.samba.org" @@ -22,8 +18,8 @@ makedepends=('python2' 'docbook-xsl' 'pkg-config' 'libbsd' 'db' 'popt' 'libcups' 'readline' 'tevent' 'acl' 'libldap' 'libcap' 'ldb>=1.1.15' 'krb5' 'pam' 'systemd' 'gamin' 'gnutls>=2.4.1' 'talloc' 'tdb' 'dbus' 'libaio') -source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.gz - http://us1.samba.org/samba/ftp/stable/${pkgbase}-${_realver}.tar.asc +source=(http://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.gz + http://us1.samba.org/samba/ftp/stable/${pkgbase}-${pkgver}.tar.asc libsystemd.patch samba.logrotate samba.pam @@ -39,7 +35,7 @@ ### UNINSTALL dmapi package before building!!! prepare() { - cd samba-${_realver} + cd samba-${pkgver} patch -Np1 -i ../libsystemd.patch } @@ -49,16 +45,16 @@ # make install, but the otherwise unsplit pieces can be split) _pkgsrc=${srcdir}/samba-pkg rm -rf ${_pkgsrc} - cd ${srcdir}/samba-${_realver} + cd ${srcdir}/samba-${pkgver} # change to use python2 SAVEIFS=${IFS} IFS=$(echo -en "\n\b") - PYTHON_CALLERS="$(find ${srcdir}/samba-${_realver} -name '*.py') -$(find ${srcdir}/samba-${_realver} -name 'wscript*') -$(find ${srcdir}/samba-${_realver} -name 'configure.ac') -$(find ${srcdir}/samba-${_realver} -name 'upgrade_from_s3') -$(find ${srcdir}/samba-${_realver}/buildtools -type f) -$(find ${srcdir}/samba-${_realver}/source4/scripting -type f)" + PYTHON_CALLERS="$(find ${srcdir}/samba-${pkgver} -name '*.py') +$(find ${srcdir}/samba-${pkgver} -name 'wscript*') +$(find ${srcdir}/samba-${pkgver} -name 'configure.ac') +$(find ${srcdir}/samba-${pkgver} -name 'upgrade_from_s3') +$(find ${srcdir}/samba-${pkgver}/buildtools -type f) +$(find ${srcdir}/samba-${pkgver}/source4/scripting -type f)" sed -i -e "s|/usr/bin/env python$|/usr/bin/env python2|" \ -e "s|python-config|python2-config|" \ -e "s|bin/python|bin/python2|" \ @@ -69,7 +65,7 @@ _samba4_idmap_modules=idmap_ad,idmap_rid,idmap_adex,idmap_hash,idmap_tdb2 _samba4_pdb_modules=pdb_tdbsam,pdb_ldap,pdb_ads,pdb_smbpasswd,pdb_wbc_sam,pdb_samba4 _samba4_auth_modules=auth_unix,auth_wbc,auth_server,auth_netlogond,auth_script,auth_samba4 - cd ${srcdir}/samba-${_realver} + cd ${srcdir}/samba-${pkgver} ./configure --enable-fhs \ --prefix=/usr \ --sbindir=/usr/bin \ @@ -98,7 +94,7 @@ # This gets skipped somehow if [ ! -e ${_pkgsrc}/usr/bin/smbtar ]; then - install -m755 ${srcdir}/samba-${_realver}/source3/script/smbtar ${_pkgsrc}/usr/bin/ + install -m755 ${srcdir}/samba-${pkgver}/source3/script/smbtar ${_pkgsrc}/usr/bin/ fi } @@ -226,7 +222,7 @@ install -D -m644 ${srcdir}/samba.conf ${pkgdir}/usr/lib/tmpfiles.d/samba.conf # install sample smb.conf install -d -m755 ${pkgdir}/etc/samba - install -m644 ${srcdir}/samba-${_realver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default + install -m644 ${srcdir}/samba-${pkgver}/packaging/LSB/smb.conf ${pkgdir}/etc/samba/smb.conf.default mkdir -p ${pkgdir}/etc/samba/private chmod 700 ${pkgdir}/etc/samba/private @@ -247,7 +243,7 @@ rm -rf ${pkgdir}/var/run # copy ldap example - install -D -m644 ${srcdir}/samba-${_realver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema + install -D -m644 ${srcdir}/samba-${pkgver}/examples/LDAP/samba.schema ${pkgdir}/usr/share/doc/samba/examples/LDAP/samba.schema } md5sums=('6950c5e9f7bdeb8a610c2ca957a15be4' 'SKIP'