diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-16 10:09:22 +0200 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-04-16 10:09:22 +0200 |
commit | 0be48442ebb71571ec0ab1bbf27bf4a0759ed19b (patch) | |
tree | 5d6384ab664e0ddbecc26676b8f56a05276cc4df /core | |
parent | e6fce62e8ff0bdb90a7e6bc3cc224bdabcd20a24 (diff) | |
parent | ea3d877b99c32e3a9e00ab220440d4518430e5bc (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
core/dbus-core/PKGBUILD
extra/dbus/PKGBUILD
extra/qt/PKGBUILD
extra/xorg-server/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
testing/cairo/PKGBUILD
testing/cairo/git_fixes.patch
testing/glib2/PKGBUILD
testing/gtk3/PKGBUILD
testing/networkmanager/PKGBUILD
testing/python/PKGBUILD
Diffstat (limited to 'core')
-rw-r--r-- | core/dbus-core/PKGBUILD | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/core/dbus-core/PKGBUILD b/core/dbus-core/PKGBUILD index 854a17c40..00d997621 100644 --- a/core/dbus-core/PKGBUILD +++ b/core/dbus-core/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 140075 2011-10-06 07:35:37Z ibiru $ +# $Id: PKGBUILD 156105 2012-04-14 07:39:59Z andyrtr $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Link Dupont <link@subpop.net> # pkgname=dbus-core -pkgver=1.4.16 -pkgrel=1.1 +pkgver=1.4.20 +pkgrel=2 pkgdesc="Freedesktop.org message bus system" url="http://www.freedesktop.org/Software/dbus" arch=(i686 x86_64 'mips64el') license=('GPL' 'custom') -depends=('expat>=2.0.1' 'coreutils' 'filesystem') +depends=('expat>=2.0.1' 'coreutils' 'filesystem' 'shadow') # shadow for install scriptlet FS#29341 makedepends=('libx11') conflicts=('dbus<1.2.3-2') options=(!libtool) install=dbus.install source=(http://dbus.freedesktop.org/releases/dbus/dbus-${pkgver}.tar.gz dbus) -md5sums=('44a2a10678e7e50460879c3eb4453a65' +md5sums=('79eca2f2c1894ac347acce128314428b' '08f93dd19cffd1b45ab05c1fd4efb560') build() { @@ -27,7 +27,7 @@ build() { --enable-inotify --disable-dnotify \ --disable-verbose-mode --disable-static \ --disable-tests --disable-asserts \ - --with-systemdsystemunitdir=/lib/systemd/system + --with-systemdsystemunitdir=/usr/lib/systemd/system make } @@ -37,8 +37,7 @@ package(){ rm -f "${pkgdir}/usr/bin/dbus-launch" rm -f "${pkgdir}/usr/share/man/man1/dbus-launch.1" - - chown 81:81 "${pkgdir}/var/run/dbus" + rm -rf "${pkgdir}/var/run" install -m755 -d "${pkgdir}/etc/rc.d" install -m755 "${srcdir}/dbus" "${pkgdir}/etc/rc.d/" @@ -46,12 +45,6 @@ package(){ #Fix configuration file sed -i -e 's|<user>81</user>|<user>dbus</user>|' "${pkgdir}/etc/dbus-1/system.conf" - #install .keep files so pacman doesn't delete empty dirs - touch "${pkgdir}/usr/share/dbus-1/services/.keep" - touch "${pkgdir}/usr/share/dbus-1/system-services/.keep" - touch "${pkgdir}/etc/dbus-1/session.d/.keep" - touch "${pkgdir}/etc/dbus-1/system.d/.keep" - install -d -m755 "${pkgdir}/usr/share/licenses/dbus-core" install -m644 COPYING "${pkgdir}/usr/share/licenses/dbus-core/" } |