Merge branch 'privileges' into 'master'

Make connectionagent privileged

See merge request !1

connd/connd.pro

@@ -1,4 +1,3 @@
-
 QT = core network dbus
 
 TARGET = connectionagent
@@ -16,16 +15,13 @@ CONFIG   -= app_bundle
 
 TEMPLATE = app
 
-OTHER_FILES += com.jolla.Connectiond.xml
+OTHER_FILES += com.jolla.Connectiond.xml privileges
 
 DBUS_ADAPTORS = connadaptor
 connadaptor.files = com.jollamobile.Connectiond.xml
 connadaptor.header_flags = -c ConnAdaptor
 connadaptor.source_flags = -c ConnAdaptor
 
-# create adaptor
-#system(qdbusxml2cpp -c ConnAdaptor -a connadaptor.h:connadaptor.cpp com.jollamobile.Connectiond.xml)
-
 SOURCES += main.cpp \
     qconnectionagent.cpp \
     wakeupwatcher.cpp
@@ -39,6 +35,3 @@ INSTALLS += target
 
 MOC_DIR = .moc
 OBJECTS_DIR = .obj
-
-
-

connd/privileges

@@ -0,0 +1,2 @@
+# Tells invoker to run connectionagent as nemo:privileged
+/usr/bin/connectionagent,

rpm/connectionagent-qt5.spec

@@ -1,7 +1,7 @@
 Name:       connectionagent-qt5
 
 Summary:    User Agent daemon
-Version:    0.11.25
+Version:    0.11
 Release:    0
 Group:      Communications/Connectivity Adaptation
 License:    LGPLv2.1
@@ -75,6 +75,9 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
 ln -s ../connectionagent.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
 
+mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
+install -m 644 -p connd/privileges %{buildroot}%{_datadir}/mapplauncherd/privileges.d/connectionagent
+
 %post
 if [ "$1" -ge 1 ]; then
 systemctl-user daemon-reload || :
@@ -91,6 +94,9 @@ fi
 %defattr(-,root,root,-)
 %{_bindir}/connectionagent
 %{_datadir}/dbus-1/services/com.jolla.Connectiond.service
+%dir %{_datadir}/mapplauncherd
+%dir %{_datadir}/mapplauncherd/privileges.d
+%{_datadir}/mapplauncherd/privileges.d/connectionagent
 %{_libdir}/systemd/user/connectionagent.service
 %{_sysconfdir}/dbus-1/session.d/connectionagent.conf
 %{_libdir}/systemd/user/user-session.target.wants/connectionagent.service