[arch-commits] Commit in krb5/trunk (PKGBUILD)

[Stéphane Gaudreault]

    Date: Wednesday, May 23, 2012 @ 16:51:16
  Author: stephane
Revision: 159407

upgpkg: krb5 1.10.1-3

Fix FS#29889 and FS#29947

Modified:
  krb5/trunk/PKGBUILD

----------+
 PKGBUILD |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-05-23 20:09:27 UTC (rev 159406)
+++ PKGBUILD	2012-05-23 20:51:16 UTC (rev 159407)
@@ -3,16 +3,13 @@
 
 pkgname=krb5
 pkgver=1.10.1
-pkgrel=2
+pkgrel=3
 pkgdesc="The Kerberos network authentication system"
 arch=('i686' 'x86_64')
 url="http://web.mit.edu/kerberos/"
 license=('custom')
 depends=('e2fsprogs' 'libldap' 'keyutils')
 makedepends=('perl')
-provides=('heimdal')
-replaces=('heimdal')
-conflicts=('heimdal')
 backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
 source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.10/${pkgname}-${pkgver}-signed.tar
         krb5-1.10.1-gcc47.patch
@@ -59,8 +56,8 @@
    cd "${srcdir}/${pkgname}-${pkgver}/src"
    make DESTDIR="${pkgdir}" EXAMPLEDIR=/usr/share/doc/${pkgname}/examples install
 
-   # Install the kerberos.schema file (Fix FS#29889)
-   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.schema "${pkgdir}"/usr/share/doc/${pkgname}/examples
+   # Fix FS#29889
+   install -m 644 plugins/kdb/ldap/libkdb_ldap/kerberos.{ldif,schema} "${pkgdir}"/usr/share/doc/${pkgname}/examples
 
    # Sample KDC config file
    install -dm 755 "${pkgdir}"/var/lib/krb5kdc
@@ -71,9 +68,7 @@
    install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
 
    install -dm 755 "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kdc      "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
-   install -m 755 ../../krb5-kpropd   "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-{kdc,kadmind,kpropd} "${pkgdir}"/etc/rc.d
 
    install -dm 755 "${pkgdir}"/usr/share/aclocal
    install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal