summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD20
2 files changed, 16 insertions, 16 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9016555e1282..63e5647907c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dbus-nosystemd
pkgdesc = Freedesktop.org message bus system
- pkgver = 1.8.0
- pkgrel = 3
+ pkgver = 1.8.2
+ pkgrel = 1
url = http://www.freedesktop.org/Software/dbus
install = dbus-nosystemd.install
arch = i686
@@ -16,21 +16,21 @@ pkgbase = dbus-nosystemd
depends = coreutils
depends = filesystem
depends = shadow
- depends = libdbus=1.8.0
+ depends = libdbus>=1.8.2
optdepends = libx11: dbus-launch support
optdepends = dbus-openrc: dbus openrc initscript
provides = dbus-core
- provides = dbus=1.8.0
+ provides = dbus=1.8.2
conflicts = dbus-core
conflicts = dbus
conflicts = dbus-eudev
replaces = dbus-core
replaces = dbus
replaces = dbus-eudev
- source = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.0.tar.gz
+ source = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.2.tar.gz
source = 30-dbus
source = dbus
- md5sums = 059fbe84e39fc99c67a14f15b1f39dff
+ md5sums = d6f709bbec0a022a1847c7caec9d6068
md5sums = 3314d727fa57fc443fce25b5cbeebbcc
md5sums = 6f116e46adcbe99326ee67e597598d29
diff --git a/PKGBUILD b/PKGBUILD
index e2d941b9b135..f45e58a0910d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
# Contributor: Link Dupont <link@subpop.net>
#
pkgname=dbus-nosystemd
-pkgver=1.8.0
-pkgrel=3
+pkgver=1.8.2
+pkgrel=1
pkgdesc="Freedesktop.org message bus system"
url="http://www.freedesktop.org/Software/dbus"
arch=(i686 x86_64)
license=('GPL' 'custom')
groups=('eudev-base')
# dep on shadow for install scriptlet FS#29341
-depends=('expat' 'coreutils' 'filesystem' 'shadow' "libdbus=${pkgver}")
+depends=('expat' 'coreutils' 'filesystem' 'shadow' "libdbus>=${pkgver}")
makedepends=('libx11' 'xmlto' 'docbook-xsl')
optdepends=('libx11: dbus-launch support'
'dbus-openrc: dbus openrc initscript')
@@ -21,7 +21,7 @@ replaces=('dbus-core' 'dbus' 'dbus-eudev')
install=dbus-nosystemd.install
source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
30-dbus dbus)
-md5sums=('059fbe84e39fc99c67a14f15b1f39dff'
+md5sums=('d6f709bbec0a022a1847c7caec9d6068'
'3314d727fa57fc443fce25b5cbeebbcc'
'6f116e46adcbe99326ee67e597598d29')
@@ -48,14 +48,14 @@ build() {
package(){
cd dbus-$pkgver
- make DESTDIR="$pkgdir" install
- rm -rf "$pkgdir/var/run"
+ # Disable installation of libdbus
+ sed -i -e 's/^SUBDIRS = dbus/SUBDIRS =/' Makefile
+
+ make DESTDIR="$pkgdir" install
- rm -r "$pkgdir"/usr/include
- rm -r "$pkgdir"/usr/lib/pkgconfig
- rm -r "$pkgdir"/usr/lib/libdbus*
- rm -r "$pkgdir"/usr/lib/dbus-1.0/include
+ rm -rf "${pkgdir}/var/run"
+ rm -rf "${pkgdir}/usr/lib/pkgconfig"
install -Dm755 ../dbus "$pkgdir/etc/rc.d/dbus"
install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"