Date: Monday, May 16, 2011 @ 10:51:09 Author: andrea Revision: 124073
upgpkg: fam 2.7.0-15 do not hardcode the path to rpcbind status file (fixes FS#24070) Modified: fam/trunk/PKGBUILD fam/trunk/fam ----------+ PKGBUILD | 41 +++++++++++++++++++++++------------------ fam | 2 +- 2 files changed, 24 insertions(+), 19 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-05-16 14:50:02 UTC (rev 124072) +++ PKGBUILD 2011-05-16 14:51:09 UTC (rev 124073) @@ -1,16 +1,17 @@ # $Id$ -# Maintainer: Allan McRae <al...@archlinux.org> +# Maintainer: +# Contributor: Allan McRae <al...@archlinux.org> # Contributor: Tom Newsom <jeeps...@gmx.co.uk> pkgname=fam pkgver=2.7.0 -pkgrel=14 +pkgrel=15 pkgdesc="File Alteration Monitor" arch=('i686' 'x86_64') license=('LGPL' 'GPL') depends=('rpcbind' 'gcc-libs' 'bash') url="http://oss.sgi.com/projects/fam/" -backup=(etc/fam/fam.conf) +backup=('etc/fam/fam.conf') options=('!makeflags') # Don't !libtool source=(ftp://oss.sgi.com/projects/fam/download/stable/${pkgname}-${pkgver}.tar.gz fam-2.7.0-dnotify.patch @@ -23,25 +24,29 @@ '47b41e0b0498793af004696a096d7da1' '2638b8ffacb9f03b6e438e08ea7b290a' 'fc0cabc0ac4f819680401eb3090c29c9' - '0b4dd9894ccc03f57787f9dfc0a7bd6f') + '92a37f9eb6ad0e60ded9c70e9ad93a88') build() { - cd ${srcdir}/${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/fam-2.7.0-dnotify.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-largefiles.patch || return 1 - patch -Np0 -i ${srcdir}/fam-2.7.0-limits.patch || return 1 - patch -Np1 -i ${srcdir}/fam-2.7.0-buildfixes.patch || return 1 + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/fam-2.7.0-dnotify.patch + patch -p1 -i "${srcdir}"/fam-2.7.0-largefiles.patch + patch -p0 -i "${srcdir}"/fam-2.7.0-limits.patch + patch -p1 -i "${srcdir}"/fam-2.7.0-buildfixes.patch - chmod 755 configure || return 1 + chmod 755 configure - autoheader || return 1 - aclocal || return 1 - automake -a -c || return 1 - autoconf || return 1 - libtoolize --copy --force || return 1 + autoheader + aclocal + automake -a -c + autoconf + libtoolize --copy --force ./configure --prefix=/usr --sysconfdir=/etc/fam - make || return 1 - make DESTDIR=${pkgdir} install - install -D -m755 ../fam ${pkgdir}/etc/rc.d/fam + make } + +package() { + cd "${srcdir}"/${pkgname}-${pkgver} + make DESTDIR="${pkgdir}" install + install -D -m755 "${srcdir}"/fam "${pkgdir}"/etc/rc.d/fam +} Modified: fam =================================================================== --- fam 2011-05-16 14:50:02 UTC (rev 124072) +++ fam 2011-05-16 14:51:09 UTC (rev 124073) @@ -9,7 +9,7 @@ #Check for running portmap, start when not running ck_daemon rpcbind && /etc/rc.d/rpcbind start stat_busy "Starting File Alteration Monitor" - if [ ! -f /var/run/daemons/rpcbind ]; then + if ck_daemon rpcbind; then stat_fail echo "ERROR: rpcbind is not running" exit 1