Skip to content

Commit

Permalink
Merge branch 'jb38238' into 'master'
Browse files Browse the repository at this point in the history
[timed] Provide privileges files for mapplauncher. Contributes to JB#38238

See merge request mer-core/timed!9
  • Loading branch information
rainemak committed Feb 5, 2019
2 parents 759dece + f7af6e9 commit f709e78
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions rpm/timed-qt5.privileges
@@ -0,0 +1 @@
/usr/bin/timed-qt5,s
5 changes: 5 additions & 0 deletions rpm/timed-qt5.spec
Expand Up @@ -7,6 +7,7 @@ Group: System/System Control
License: LGPLv2.1
URL: https://git.merproject.org/mer-core/timed
Source0: %{name}-%{version}.tar.bz2
Source1: %{name}.privileges
Requires: tzdata
Requires: tzdata-timed
Requires: systemd
Expand Down Expand Up @@ -81,6 +82,9 @@ rm -rf %{buildroot}
install -d %{buildroot}%{_libdir}/systemd/user/pre-user-session.target.wants/
ln -s ../%{name}.service %{buildroot}%{_libdir}/systemd/user/pre-user-session.target.wants/%{name}.service

mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d/

# Missing executable flags.
chmod 755 %{buildroot}%{_oneshotdir}/setcaps-%{name}.sh

Expand Down Expand Up @@ -138,6 +142,7 @@ fi
%{_libdir}/lib%{name}.so.*
%{_libdir}/libtimed-voland-qt5.so.*
%{_datadir}/contextkit/providers/com.nokia.time.context
%{_datadir}/mapplauncherd/privileges.d/*
%{_libdir}/systemd/user/%{name}.service
%{_libdir}/systemd/user/pre-user-session.target.wants/%{name}.service
%{_oneshotdir}/setcaps-%{name}.sh
Expand Down

0 comments on commit f709e78

Please sign in to comment.