Merge branch 'jb38238' into 'master'

Provide privileges files for mapplauncher

See merge request mer-core/messagingframework!26

rpm/qmf-qt5.privileges

@@ -0,0 +1 @@
+/usr/bin/messageserver5,e

rpm/qmf-qt5.spec

@@ -6,6 +6,7 @@ Group:      System/Libraries
 License:    LGPLv2.1 with exception or GPLv3
 URL:        http://qt.gitorious.org/qt-labs/messagingframework
 Source0:    %{name}-%{version}.tar.bz2
+Source1:    %{name}.privileges
 Requires:   systemd-user-session-targets
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(icu-i18n)
@@ -200,6 +201,9 @@ mkdir -p "$UNIT_DIR"
 ln -sf ../messageserver5.service "$UNIT_DIR/messageserver5.service"
 ln -sf ../messageserver5-accounts-check.service "$UNIT_DIR/messageserver5-accounts-check.service"
 
+mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
+install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d
+
 %fdupes  %{buildroot}/%{_includedir}
 
 %post -n libqmfmessageserver1-qt5 -p /sbin/ldconfig
@@ -233,27 +237,26 @@ ln -sf ../messageserver5-accounts-check.service "$UNIT_DIR/messageserver5-accoun
 %defattr(-,root,root,-)
 %{_bindir}/messageserver5
 %{_bindir}/qmf-accountscheck
+%{_datadir}/mapplauncherd/privileges.d/*
 %{_libdir}/libQmfMessageServer.so.*
-%{_libdir}/qt5/plugins/messageservices/
-%{_libdir}/systemd/user/messageserver5.service
-%{_libdir}/systemd/user/messageserver5-accounts-check.service
-%{_libdir}/systemd/user/user-session.target.wants/messageserver5.service
-%{_libdir}/systemd/user/user-session.target.wants/messageserver5-accounts-check.service
+%{_libdir}/qt5/plugins/messageservices
+%{_libdir}/systemd/user/*.service
+%{_libdir}/systemd/user/user-session.target.wants/*.service
 
 %files -n libqmfclient1-qt5
 %defattr(-,root,root,-)
 %{_libdir}/libQmfClient.so.*
-%{_libdir}/qt5/plugins/contentmanagers/libqmfstoragemanager.so
-%{_libdir}/qt5/plugins/ssoauth/
+%{_libdir}/qt5/plugins/contentmanagers
+%{_libdir}/qt5/plugins/ssoauth
 
 %files -n libqmfclient1-qt5-cryptoplugins
-%{_libdir}/qt5/plugins/crypto/
+%{_libdir}/qt5/plugins/crypto
 
 %if 0
 %files tests
 %defattr(-,root,root,-)
 %{_datadir}/accounts/*
-/opt/tests/qmf-qt5/*
+/opt/tests/qmf-qt5
 %else
 %exclude %{_datadir}/accounts/*
 %endif