diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-26 18:59:42 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-09-26 18:59:42 -0300 |
| commit | 959510fa239cdcdaf0d8d3875cd2aaf652d74241 (patch) | |
| tree | 0afdc6c433cbf03de1656e5d2557838af7098214 /core/procps-ng/PKGBUILD | |
| parent | 37c6b66933676a18529b4e647d1a79a626900512 (diff) | |
| parent | 483f8b3ac46ac2d40e8cc2f9c25365741bebc791 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/happy/PKGBUILD
community-staging/haskell-quickcheck/PKGBUILD
community/mingw32-gcc-base/PKGBUILD
core/mlocate/PKGBUILD
core/procps-ng/PKGBUILD
core/sysvinit/PKGBUILD
elementary/gtk-engine-equinox/PKGBUILD
extra/audacious/PKGBUILD
extra/libsigc++/PKGBUILD
extra/postgresql-old-upgrade/PKGBUILD
extra/qt/PKGBUILD
extra/tftp-hpa/PKGBUILD
extra/transmission/PKGBUILD
gnome-unstable/at-spi2-atk/PKGBUILD
gnome-unstable/at-spi2-core/PKGBUILD
gnome-unstable/atk/PKGBUILD
gnome-unstable/clutter/PKGBUILD
gnome-unstable/evolution-data-server/PKGBUILD
gnome-unstable/evolution/PKGBUILD
gnome-unstable/gjs/PKGBUILD
gnome-unstable/glib-networking/PKGBUILD
gnome-unstable/glib2/PKGBUILD
gnome-unstable/gnome-desktop/PKGBUILD
gnome-unstable/gnome-online-accounts/PKGBUILD
gnome-unstable/gnome-settings-daemon/PKGBUILD
gnome-unstable/gnome-themes-standard/PKGBUILD
gnome-unstable/gobject-introspection/PKGBUILD
gnome-unstable/gtk3/PKGBUILD
gnome-unstable/gtkhtml4/PKGBUILD
gnome-unstable/gvfs/PKGBUILD
gnome-unstable/libsoup/PKGBUILD
gnome-unstable/nautilus/PKGBUILD
gnome-unstable/vala/PKGBUILD
gnome-unstable/webkitgtk3/PKGBUILD
libre/libretools/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-qt/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
testing/mlocate/PKGBUILD
testing/openmpi/PKGBUILD
testing/run-parts/PKGBUILD
testing/systemd/PKGBUILD
testing/transmission/PKGBUILD
testing/transmission/transmission-cli.install
testing/transmission/transmission.systemd
Diffstat (limited to 'core/procps-ng/PKGBUILD')
| -rw-r--r-- | core/procps-ng/PKGBUILD | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/core/procps-ng/PKGBUILD b/core/procps-ng/PKGBUILD index fe2c7d8b9..71a967c00 100644 --- a/core/procps-ng/PKGBUILD +++ b/core/procps-ng/PKGBUILD @@ -1,10 +1,11 @@ -# $Id: PKGBUILD 163561 2012-07-15 23:10:42Z eric $ -# Maintainer: Eric Bélanger <eric@archlinux.org> +# $Id: PKGBUILD 166961 2012-09-23 12:22:10Z tomegun $ +# Maintainer: Gaetan Bisson <bisson@archlinux.org> +# Contributor: Eric Bélanger <eric@archlinux.org> pkgname=procps-ng pkgver=3.3.3 -pkgrel=3 -pkgdesc="Utilities for monitoring your system and processes on your system" +pkgrel=6 +pkgdesc='Utilities for monitoring your system and its processes' arch=('i686' 'x86_64' 'mips64el') url="http://gitorious.org/procps" license=('GPL' 'LGPL') @@ -19,7 +20,7 @@ options=('!libtool') source=(procps-ng-${pkgver}.tar.gz::http://gitorious.org/procps/procps/archive-tarball/v${pkgver} sysctl.conf) sha1sums=('e78a098f1a3c06722155800cc5cfa0c865af03c0' - 'efb6cdc17ee39be8433ae9c8e9bb02d1f47eeefc') + '97ff07bab9aa5daa8d54a1346f73ba74f8e12a53') build() { cd "${srcdir}/procps-procps" @@ -32,5 +33,9 @@ build() { package() { cd "${srcdir}/procps-procps" make DESTDIR="${pkgdir}" install - install -D -m644 "${srcdir}/sysctl.conf" "${pkgdir}/etc/sysctl.conf" + install -D -m644 ../sysctl.conf "${pkgdir}/etc/sysctl.conf" + + # provided by util-linux + rm "${pkgdir}/bin/kill" + rm "${pkgdir}/usr/share/man/man1/kill.1" } |