[arch-commits] Commit in jabberd/repos (extra-i686 extra-i686/PKGBUILD)

[Eric Belanger]

    Date: Monday, July 14, 2008 @ 20:52:17
  Author: eric
Revision: 5296

Merged revisions 4576-5295 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/jabberd/trunk

........
  r5295 | eric | 2008-07-14 20:52:03 -0400 (Mon, 14 Jul 2008) | 2 lines
  
  upgpkg: jabberd 2.0s11-7
      rebuilt against correct db version - 4.7 (close FS#10909), added license, FSH man pages
........

Modified:
  jabberd/repos/extra-i686/	(properties)
  jabberd/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


Property changes on: jabberd/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /jabberd/trunk:1-4575
   + /jabberd/trunk:1-5295

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-07-15 00:52:03 UTC (rev 5295)
+++ extra-i686/PKGBUILD	2008-07-15 00:52:17 UTC (rev 5296)
@@ -4,10 +4,11 @@
 
 pkgname=jabberd
 pkgver=2.0s11
-pkgrel=6
+pkgrel=7
 pkgdesc="Jabber protocol server."
 arch=(i686 x86_64)
 url="http://jabberd.jabberstudio.org"
+license=('GPL')
 depends=('openssl' 'pam>=1.0.1-2' 'db>=4.7' 'perl' 'libidn' 'bash' 'mysql' 'libmysqlclient')
 backup=(etc/jabberd/c2s.xml etc/jabberd/jabberd.cfg etc/jabberd/resolver.xml \
         etc/jabberd/router-users.xml etc/jabberd/router.xml \
@@ -30,7 +31,7 @@
   # DESTDIR doesn't work - do it the hard way
   #
   /bin/mkdir -p $startdir/pkg/etc/jabberd $startdir/pkg/usr/bin \
-      $startdir/pkg/usr/man/man8 $startdir/pkg/etc/rc.d \
+      $startdir/pkg/usr/share/man/man8 $startdir/pkg/etc/rc.d \
       $startdir/pkg/var/run $startdir/pkg/var/lib
   /bin/install -o17 -g17 -m4755 sm/sm $startdir/pkg/usr/bin/sm
   /bin/install -o17 -g17 -m4755 s2s/s2s $startdir/pkg/usr/bin/s2s
@@ -64,7 +65,7 @@
   /bin/rm $startdir/pkg/var/lib/jabberd/db/jabberd
   /bin/rm $startdir/pkg/var/run/jabberd/jabberd
 
-  /bin/cp man/*.8 $startdir/pkg/usr/man/man8
+  /bin/cp man/*.8 $startdir/pkg/usr/share/man/man8
   /bin/install -m0755 $startdir/src/jabberd $startdir/pkg/etc/rc.d/jabberd
 
   # fix pid paths