From 6916aea8a9d1e50da305d07fb82cf8cdb36ba529 Mon Sep 17 00:00:00 2001
From: Lorn Potter <lorn.potter@jollamobile.com>
Date: Thu, 6 Jun 2013 14:13:01 +1000
Subject: [PATCH] [connectionagent] Add dbus policy file.

bump version
---
 config/config.pro            | 5 ++++-
 rpm/connectionagent-qt5.spec | 1 +
 rpm/connectionagent-qt5.yaml | 2 ++
 rpm/connectionagent.spec     | 3 ++-
 rpm/connectionagent.yaml     | 4 +++-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/config/config.pro b/config/config.pro
index 6f0a235..914ab6f 100644
--- a/config/config.pro
+++ b/config/config.pro
@@ -11,4 +11,7 @@ dbusservice.files = com.jolla.Connectiond.service
 systemdservice.path = $${INSTALL_PREFIX}/usr/lib/systemd/user
 systemdservice.files = connectionagent.service
 
-INSTALLS += dbusservice systemdservice
+dbusconfig.path = /etc/dbus-1/session.d
+dbusconfig.files = connectionagent.conf
+
+INSTALLS += dbusservice systemdservice dbusconfig
diff --git a/rpm/connectionagent-qt5.spec b/rpm/connectionagent-qt5.spec
index 275670d..976b357 100644
--- a/rpm/connectionagent-qt5.spec
+++ b/rpm/connectionagent-qt5.spec
@@ -78,6 +78,7 @@ rm -rf %{buildroot}
 %{_bindir}/connectionagent
 %{_datadir}/dbus-1/services/com.jolla.Connectiond.service
 %{_libdir}/systemd/user/connectionagent.service
+%{_sysconfdir}/dbus-1/session.d/connectionagent.conf
 # >> files
 # << files
 
diff --git a/rpm/connectionagent-qt5.yaml b/rpm/connectionagent-qt5.yaml
index 0428ccd..409846e 100644
--- a/rpm/connectionagent-qt5.yaml
+++ b/rpm/connectionagent-qt5.yaml
@@ -28,6 +28,8 @@ Files:
     - "%{_bindir}/connectionagent"
     - "%{_datadir}/dbus-1/services/com.jolla.Connectiond.service"
     - "%{_libdir}/systemd/user/connectionagent.service"
+    - "%{_sysconfdir}/dbus-1/session.d/connectionagent.conf"
+
 SubPackages:
     - Name: declarative
       Summary: Declarative plugin for connection agent.
diff --git a/rpm/connectionagent.spec b/rpm/connectionagent.spec
index 51ecbd1..8388063 100644
--- a/rpm/connectionagent.spec
+++ b/rpm/connectionagent.spec
@@ -9,7 +9,7 @@ Name:       connectionagent
 # << macros
 
 Summary:    User Agent daemon
-Version:    0.6.10
+Version:    0.6.11
 Release:    0
 Group:      Communications/Connectivity Adaptation
 License:    LGPLv2
@@ -76,6 +76,7 @@ rm -rf %{buildroot}
 %{_bindir}/connectionagent
 %{_datadir}/dbus-1/services/com.jolla.Connectiond.service
 %{_libdir}/systemd/user/connectionagent.service
+%{_sysconfdir}/dbus-1/session.d/connectionagent.conf
 # >> files
 # << files
 
diff --git a/rpm/connectionagent.yaml b/rpm/connectionagent.yaml
index cba1066..ec410d9 100644
--- a/rpm/connectionagent.yaml
+++ b/rpm/connectionagent.yaml
@@ -1,6 +1,6 @@
 Name: connectionagent
 Summary: User Agent daemon
-Version: 0.6.10
+Version: 0.6.11
 Release: 0
 Group: "Communications/Connectivity Adaptation"
 License: LGPLv2
@@ -25,6 +25,8 @@ Files:
     - "%{_bindir}/connectionagent"
     - "%{_datadir}/dbus-1/services/com.jolla.Connectiond.service"
     - "%{_libdir}/systemd/user/connectionagent.service"
+    - "%{_sysconfdir}/dbus-1/session.d/connectionagent.conf"
+
 SubPackages:
     - Name: declarative
       Summary: Declarative plugin for connection agent.