summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Iooss2015-09-26 16:43:56 +0200
committerNicolas Iooss2015-09-26 16:43:56 +0200
commitb236a34e99da14e11ab77a157d841b3ed5796333 (patch)
tree8fbb26bc445c5e6462b2b81fc0fadcdb5527e788
parent1cbc0be17e783940fb44f0559d53821351d5df80 (diff)
downloadaur-b236a34e99da14e11ab77a157d841b3ed5796333.tar.gz
dbus-selinux 1.10.0-3 update
-rw-r--r--.SRCINFO10
-rw-r--r--30-dbus6
-rw-r--r--PKGBUILD10
3 files changed, 7 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f7bbb50a203c..40b6400874c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = dbus-selinux
pkgdesc = Freedesktop.org message bus system with SELinux support
pkgver = 1.10.0
- pkgrel = 2
+ pkgrel = 3
url = http://www.freedesktop.org/Software/dbus
arch = i686
arch = x86_64
@@ -16,10 +16,8 @@ pkgbase = dbus-selinux
makedepends = libselinux
source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.0.tar.gz
source = http://dbus.freedesktop.org/releases/dbus/dbus-1.10.0.tar.gz.asc
- source = 30-dbus
md5sums = 5af6297348107a906c8449817a728b3b
md5sums = SKIP
- md5sums = 6683a05bd749929ef9442816c22c3268
pkgname = dbus-selinux
depends = libdbus-selinux
@@ -29,8 +27,8 @@ pkgname = dbus-selinux
depends = libsystemd-selinux
optdepends = libx11: dbus-launch support
provides = dbus-core
- provides = dbus=1.10.0-2
- provides = selinux-dbus=1.10.0-2
+ provides = dbus=1.10.0-3
+ provides = selinux-dbus=1.10.0-3
conflicts = dbus-core
conflicts = dbus
conflicts = selinux-dbus
@@ -40,7 +38,7 @@ pkgname = dbus-selinux
pkgname = libdbus-selinux
pkgdesc = DBus library
depends = libsystemd-selinux
- provides = libdbus=1.10.0-2
+ provides = libdbus=1.10.0-3
conflicts = libdbus
replaces = libdbus
diff --git a/30-dbus b/30-dbus
deleted file mode 100644
index 96a51828ab9c..000000000000
--- a/30-dbus
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-if [ -z "${DBUS_SESSION_BUS_ADDRESS-}" ] && type dbus-launch >/dev/null; then
- eval $(dbus-launch --sh-syntax --exit-with-session)
-fi
diff --git a/PKGBUILD b/PKGBUILD
index 1f5dc028401b..6d2b6a1f7301 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,18 +7,16 @@
pkgbase=dbus-selinux
pkgname=('dbus-selinux' 'libdbus-selinux')
pkgver=1.10.0
-pkgrel=2
+pkgrel=3
pkgdesc="Freedesktop.org message bus system with SELinux support"
url="http://www.freedesktop.org/Software/dbus"
arch=(i686 x86_64)
license=('GPL' 'custom')
groups=('selinux')
makedepends=('libx11' 'systemd-selinux' 'xmlto' 'docbook-xsl' 'audit' 'libselinux')
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc}
- 30-dbus)
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz{,.asc})
md5sums=('5af6297348107a906c8449817a728b3b'
- 'SKIP'
- '6683a05bd749929ef9442816c22c3268')
+ 'SKIP')
validpgpkeys=('DA98F25C0871C49A59EAFF2C4DE8FF2A63C7CC90') # Simon McVittie <simon.mcvittie@collabora.co.uk>
build() {
@@ -53,9 +51,7 @@ package_dbus-selinux(){
rm -r "${pkgdir}/var/run"
rm -r "${pkgdir}/usr/lib/pkgconfig"
- rm -r "${pkgdir}/usr/lib/systemd/user/sockets.target.wants"
- install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus.sh"
install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus-selinux/COPYING"
}