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

[Jan de Groot]

    Date: Wednesday, August 3, 2011 @ 16:35:03
  Author: jgc
Revision: 134437

Merge changes from cyrus-sasl

Modified:
  libsasl/trunk/	(properties)
  libsasl/trunk/PKGBUILD

----------+
 PKGBUILD |   18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)


Property changes on: libsasl/trunk
___________________________________________________________________
Added: svn:mergeinfo
   + /cyrus-sasl/trunk:134435-134436

Modified: trunk/PKGBUILD
===================================================================
--- trunk/PKGBUILD	2011-08-03 20:33:18 UTC (rev 134436)
+++ trunk/PKGBUILD	2011-08-03 20:35:03 UTC (rev 134437)
@@ -143,10 +143,12 @@
   rm -f "${pkgdir}"/usr/lib/sasl2/libsql.so*
   rm -f "${pkgdir}"/usr/lib/sasl2/libgssapiv2.so*
   rm -f "${pkgdir}"/usr/lib/sasl2/libldapdb.so*
+  install -m755 -d "${pkgdir}/usr/share/licenses/libsasl"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/libsasl/"
 }
 
 package_cyrus-sasl() {
-  depends=('libsasl')
+  depends=("libsasl=${pkgver}-${pkgrel}")
   pkgdesc="Cyrus saslauthd SASL authentication daemon"
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/saslauthd"
@@ -154,7 +156,10 @@
   install -m755 -d "${pkgdir}/etc/rc.d"
   install -m755 -d "${pkgdir}/etc/conf.d"
   install -m755 "${srcdir}/saslauthd" "${pkgdir}/etc/rc.d/"
-  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/"
+  install -m644 "${srcdir}/saslauthd.conf.d" "${pkgdir}/etc/conf.d/saslauthd"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl/"
 }
 
 package_cyrus-sasl-gssapi() {
@@ -165,6 +170,9 @@
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libgssapiv2.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-gssapi/"
 }
 
 package_cyrus-sasl-ldap() {
@@ -175,6 +183,9 @@
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libldapdb.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-ldap/"
 }
 
 package_cyrus-sasl-sql() {
@@ -185,4 +196,7 @@
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
   install -m755 -d "${pkgdir}/usr/lib/sasl2"
   cp -a .libs/libsql.so* "${pkgdir}/usr/lib/sasl2/"
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/cyrus-sasl-sql"
+  ln -sf ../libsasl/COPYING "${pkgdir}/usr/share/licenses/cyrus-sasl-sql/"
 }