version 1.8.0-1

3 files changed, 32 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a2d5cf6be45c..285f6c6c195c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = dbus-nosystemd
 	pkgdesc = Freedesktop.org message bus system
-	pkgver = 1.6.18
-	pkgrel = 2
+	pkgver = 1.8.0
+	pkgrel = 1
 	url = http://www.freedesktop.org/Software/dbus
 	install = dbus-nosystemd.install
 	arch = i686
@@ -9,26 +9,28 @@ pkgbase = dbus-nosystemd
 	license = GPL
 	license = custom
 	makedepends = libx11
+	makedepends = xmlto
+	makedepends = docbook-xsl
 	depends = expat
 	depends = coreutils
 	depends = filesystem
 	depends = shadow
 	optdepends = libx11: dbus-launch support
 	provides = dbus-core
-	provides = dbus=1.6.18
-	provides = libdbus=1.6.18
+	provides = dbus=1.8.0
+	provides = libdbus=1.8.0
 	conflicts = dbus-core
 	conflicts = dbus
+	conflicts = libdbus
 	replaces = dbus-core
 	replaces = dbus
-	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.6.18.tar.gz
+	replaces = libdbus
+	source = http://dbus.freedesktop.org/releases/dbus/dbus-1.8.0.tar.gz
 	source = 30-dbus
 	source = dbus
-	source = memleak.patch
-	md5sums = b02e9c95027a416987b81f9893831061
+	md5sums = 059fbe84e39fc99c67a14f15b1f39dff
 	md5sums = 3314d727fa57fc443fce25b5cbeebbcc
-	md5sums = f0364f3f5dc5f653bb05d39aa36e3264
-	md5sums = cf86d68e39d975cec1e9f0342eb9b142
+	md5sums = 6f116e46adcbe99326ee67e597598d29
 
 pkgname = dbus-nosystemd
 
diff --git a/PKGBUILD b/PKGBUILD
index 262e69279896..13aa8d912abf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,43 +3,42 @@
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus-nosystemd
-pkgver=1.6.18
-pkgrel=2
+pkgver=1.8.0
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
 # dep on shadow for install scriptlet FS#29341
 depends=('expat' 'coreutils' 'filesystem' 'shadow')
-makedepends=('libx11')
+makedepends=('libx11' 'xmlto' 'docbook-xsl')
 optdepends=('libx11: dbus-launch support')
 provides=('dbus-core' "dbus=${pkgver}" "libdbus=${pkgver}")
-conflicts=('dbus-core' 'dbus')
-replaces=('dbus-core' 'dbus')
+conflicts=('dbus-core' 'dbus' 'libdbus')
+replaces=('dbus-core' 'dbus' 'libdbus')
 install=dbus-nosystemd.install
 source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
-	30-dbus dbus memleak.patch)
-md5sums=('b02e9c95027a416987b81f9893831061'
+	30-dbus dbus)
+md5sums=('059fbe84e39fc99c67a14f15b1f39dff'
          '3314d727fa57fc443fce25b5cbeebbcc'
-         'f0364f3f5dc5f653bb05d39aa36e3264'
-         'cf86d68e39d975cec1e9f0342eb9b142')
-
-prepare() {
-	cd dbus-$pkgver
-
-	patch -Np1 -i ../memleak.patch
-}
+         '6f116e46adcbe99326ee67e597598d29')
 
 build() {
   cd dbus-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-      --libexecdir=/usr/lib/dbus-1.0 --with-dbus-user=dbus \
+  ./configure --prefix=/usr \
+      --sysconfdir=/etc \
+      --localstatedir=/var \
+      --libexecdir=/usr/lib/dbus-1.0 \
+      --with-dbus-user=dbus \
       --with-system-pid-file=/run/dbus/pid \
       --with-system-socket=/run/dbus/system_bus_socket \
       --with-console-auth-dir=/run/console/ \
-      --enable-inotify --disable-dnotify \
-      --disable-verbose-mode --disable-static \
-      --disable-tests --disable-asserts
+      --enable-inotify \
+      --disable-verbose-mode \
+      --disable-static \
+      --disable-tests \
+      --disable-asserts \
+      --disable-systemd
 
   make
 }
@@ -54,3 +53,4 @@ package(){
   install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
+
diff --git a/dbus b/dbus
index bf532a274454..a3d874d61e10 100644
--- a/dbus
+++ b/dbus
@@ -8,7 +8,7 @@ case $1 in
     start)
         stat_busy "Starting D-BUS system messagebus"
         if [[ ! -d /run/dbus ]] ; then
-            install -m755 -g 81 -o 81 -d /run/dbus
+            install -m755 -g dbus -o dbus -d /run/dbus
         fi
 
         if ! dbus-daemon --system; then