New commits:
commit 472781d07f3d83eac2f3ba432cc2f405d76e8a5e
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>
utils/dbus: version 1.16.0
diff --git a/utils/dbus/BUILD b/utils/dbus/BUILD
index 8a9db3d..df36791 100755
--- a/utils/dbus/BUILD
+++ b/utils/dbus/BUILD
@@ -1,26 +1,13 @@
-if [[ "${DBUS_BRANCH}" == "devel" ]]; then
- OPTS="runtime_dir=${TRACK_ROOT}/run ${OPTS}" &&
- if [ "$DBUS_SELINUX" == "y" ]; then
- OPTS="selinux=enabled ${OPTS}"
- fi &&
- # Glib2 is used for regression tests and can cause unnecessary build
failure
- # when we're in a chain where libffi just has been updated and glib2 not
yet.
- # Other solution would be to unnecessarily depend on glib2, or even
- # dbus-glib, which just smells too circular.
- OPTS="user_session=true modular_tests=disabled ${OPTS}"
-else
- OPTS="--runstatedir=${TRACK_ROOT}/run ${OPTS}" &&
- if [ "$DBUS_SELINUX" == "y" ]; then
- OPTS="--enable-selinux ${OPTS}"
- fi &&
- OPTS="--enable-user-session --disable-modular-tests ${OPTS}"
+OPTS="runtime_dir=${TRACK_ROOT}/run ${OPTS}" &&
+if [ "$DBUS_SELINUX" == "y" ]; then
+ OPTS="selinux=enabled ${OPTS}"
fi &&
+# Glib2 is used for regression tests and can cause unnecessary build failure
+# when we're in a chain where libffi just has been updated and glib2 not yet.
+# Other solution would be to unnecessarily depend on glib2, or even
+# dbus-glib, which just smells too circular.
+OPTS="user_session=true modular_tests=disabled ${OPTS}"