Skip to content

Commit

Permalink
Merge branch 'jb38238' into 'master'
Browse files Browse the repository at this point in the history
Provide privileges files for mapplauncher

See merge request mer-core/buteo-mtp!17
  • Loading branch information
rainemak committed Jan 18, 2019
2 parents a3acd67 + 658e3ea commit cf9e3ae
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
1 change: 1 addition & 0 deletions rpm/buteo-mtp-qt5.privileges
@@ -0,0 +1 @@
/usr/bin/buteo-mtp,p
13 changes: 9 additions & 4 deletions rpm/buteo-mtp-qt5.spec
Expand Up @@ -6,6 +6,7 @@ Group: System/Libraries
License: LGPLv2.1
URL: https://github.com/nemomobile/buteo-mtp
Source0: %{name}-%{version}.tar.gz
Source1: %{name}.privileges
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Sparql)
BuildRequires: pkgconfig(Qt5DBus)
Expand Down Expand Up @@ -36,14 +37,16 @@ Obsoletes: buteo-mtp < %{version}
# move user session startup into sub-package
%files
%defattr(-,root,root,-)
/usr/lib/systemd/user/buteo-mtp.service
%{_unitdir}/*.mount
%{_unitdir}/local-fs.target.wants/*.mount
%{_bindir}/buteo-mtp
%{_libdir}/*.so.*
%{_libdir}/mtp/*.so
%{_libdir}/mtp/mtp_service
%{_libdir}/mtp/start-mtp.sh
%{_libdir}/mtp
%{_libdir}/systemd/user/buteo-mtp.service
%{_datadir}/mapplauncherd/privileges.d/*
# Own the fstorage.d and mtp data directories.
%dir %{_sysconfdir}/fsstorage.d
%dir %{_datadir}/mtp

%package sample-vendor-configuration
Summary: Vendor configuration example for MTP
Expand Down Expand Up @@ -119,6 +122,8 @@ chmod +x %{buildroot}/%{_bindir}/buteo-mtp
mkdir -p %{buildroot}/%{_unitdir}/local-fs.target.wants
ln -s ../dev-mtp.mount %{buildroot}/%{_unitdir}/local-fs.target.wants/

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

# create group if it does not exist yet, though don't remove it
# as it should come from other packages
Expand Down

0 comments on commit cf9e3ae

Please sign in to comment.