diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-10 11:35:18 +0200 |
| commit | 51d25a8023c8dafdbcafd8bcc6adb19979f15ac6 (patch) | |
| tree | 3419b254ec8c04b09a938d993fdb768eae03c005 /community/collectd | |
| parent | 11fe0679d59f68c3fbe3d0a205e5087bf694262e (diff) | |
| parent | 7b2739f21a7ed0d52497fa381c9a2383e71ab7a8 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/kdemultimedia/PKGBUILD
extra/kdenetwork/PKGBUILD
extra/samba/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/wine/PKGBUILD
staging/kdemultimedia/PKGBUILD
Diffstat (limited to 'community/collectd')
| -rw-r--r-- | community/collectd/PKGBUILD | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 393e75ca0..5ff60e81c 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71904 2012-06-03 06:03:10Z bisson $ +# $Id: PKGBUILD 72138 2012-06-09 00:34:11Z dreisner $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.1.0 -pkgrel=3 +pkgrel=4 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64' 'mips64el') @@ -76,7 +76,10 @@ package() { make DESTDIR="${pkgdir}" install - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service + install -Dm755 "$srcdir"/rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -Dm644 "$srcdir"/service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl + + # avoid conflict with filesystem>=2012.06 + rmdir "$pkgdir/var/run" } |