Merge branch 'jb38238' into 'master'

Provide privileges files for mapplauncher

See merge request mer-core/commhistory-daemon!28

rpm/commhistory-daemon.privileges

@@ -0,0 +1 @@
+/usr/bin/commhistoryd,aehmnp

rpm/commhistory-daemon.spec

@@ -6,6 +6,7 @@ Group:      Communications/Telephony and IM
 License:    LGPLv2.1
 URL:        https://git.merproject.org/mer-core/commhistory-daemon
 Source0:    %{name}-%{version}.tar.bz2
+Source1:    %{name}.privileges
 BuildRequires:  pkgconfig(Qt5Core)
 BuildRequires:  pkgconfig(Qt5DBus)
 BuildRequires:  pkgconfig(Qt5Contacts)
@@ -39,16 +40,16 @@ Provides: voicecallhistory > 0.1.5
 %{!?qtc_make:%define qtc_make make}
 
 %package tests
-Summary: Unit tests for commhistory-daemon
+Summary: Unit tests for %{name}
 
 %description tests
-Unit tests for commhistory-daemon
+Unit tests for %{name}
 
 %package ts-devel
-Summary: Translation source for commhistory-daemon
+Summary: Translation source for %{name}
 
 %description ts-devel
-Translation source for commhistory-daemon
+Translation source for %{name}
 
 %description
 Daemon for logging communications (IM, SMS and call) in history database.
@@ -68,22 +69,25 @@ rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
 ln -s ../commhistoryd.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
 
+mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
+install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d
+
 %files
 %defattr(-,root,root,-)
 %{_bindir}/commhistoryd
 %{_libdir}/systemd/user/commhistoryd.service
 %{_libdir}/systemd/user/user-session.target.wants/commhistoryd.service
-%{_datadir}/translations/commhistoryd_eng_en.qm
+%{_datadir}/translations/*.qm
 %{_datadir}/lipstick/notificationcategories/*
 %{_datadir}/telepathy/clients/CommHistory.client
-%{_sysconfdir}/dbus-1/system.d/org.nemomobile.MmsHandler.conf
-%{_sysconfdir}/dbus-1/system.d/org.ofono.SmartMessagingAgent.conf
+%{_sysconfdir}/dbus-1/system.d/*.conf
+%{_datadir}/mapplauncherd/privileges.d/*
 
 %files tests
 %defattr(-,root,root,-)
-/opt/tests/commhistory-daemon/*
+/opt/tests/%{name}
 
 %files ts-devel
 %defattr(-,root,root,-)
-%{_datadir}/translations/source/commhistoryd.ts
+%{_datadir}/translations/source/*.ts