Commit c25f8d73 authored by Raine Makelainen's avatar Raine Makelainen

Merge branch 'jb38238' into 'master'

Provide privileges files for mapplauncher

See merge request !10
parents ca985a90 c4d2eeb6
/usr/bin/nemo-transfer-engine,aiu
...@@ -6,6 +6,7 @@ Group: System Environment/Daemon ...@@ -6,6 +6,7 @@ Group: System Environment/Daemon
License: LGPLv2.1 License: LGPLv2.1
URL: https://git.merproject.org/mer-core/transfer-engine URL: https://git.merproject.org/mer-core/transfer-engine
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Source1: %{name}.privileges
BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Sql) BuildRequires: pkgconfig(Qt5Sql)
...@@ -35,7 +36,8 @@ Obsoletes: nemo-transferengine <= 0.0.19 ...@@ -35,7 +36,8 @@ Obsoletes: nemo-transferengine <= 0.0.19
%dir %{_datadir}/nemo-transferengine %dir %{_datadir}/nemo-transferengine
%{_bindir}/nemo-transfer-engine %{_bindir}/nemo-transfer-engine
%{_datadir}/dbus-1/services/org.nemo.transferengine.service %{_datadir}/dbus-1/services/org.nemo.transferengine.service
%{_datadir}/translations/nemo-transfer-engine_eng_en.qm %{_datadir}/translations/*.qm
%{_datadir}/mapplauncherd/privileges.d/*
%package -n libnemotransferengine-qt5 %package -n libnemotransferengine-qt5
Summary: Transfer engine library. Summary: Transfer engine library.
...@@ -47,7 +49,7 @@ Group: Development/Libraries ...@@ -47,7 +49,7 @@ Group: Development/Libraries
%files -n libnemotransferengine-qt5 %files -n libnemotransferengine-qt5
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_libdir}/qt5/qml/org/nemomobile/transferengine/* %{_libdir}/qt5/qml/org/nemomobile/transferengine
%package -n libnemotransferengine-qt5-devel %package -n libnemotransferengine-qt5-devel
Summary: Development headers for transfer engine library. Summary: Development headers for transfer engine library.
...@@ -60,7 +62,7 @@ Requires: libnemotransferengine-qt5 = %{version} ...@@ -60,7 +62,7 @@ Requires: libnemotransferengine-qt5 = %{version}
%files -n libnemotransferengine-qt5-devel %files -n libnemotransferengine-qt5-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_libdir}/*.so %{_libdir}/*.so
%{_includedir}/TransferEngine-qt5/*.h %{_includedir}/TransferEngine-qt5
%{_datadir}/qt5/mkspecs/features/nemotransferengine-plugin-qt5.prf %{_datadir}/qt5/mkspecs/features/nemotransferengine-plugin-qt5.prf
%{_libdir}/pkgconfig/nemotransferengine-qt5.pc %{_libdir}/pkgconfig/nemotransferengine-qt5.pc
...@@ -76,7 +78,7 @@ Translation source for Nemo TransferEngine ...@@ -76,7 +78,7 @@ Translation source for Nemo TransferEngine
%files ts-devel %files ts-devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/translations/source/nemo-transfer-engine.ts %{_datadir}/translations/source/*.ts
%package tests %package tests
Summary: Unit tests for Nemo TransferEngine Summary: Unit tests for Nemo TransferEngine
...@@ -88,7 +90,7 @@ Unit tests for Nemo TransferEngine ...@@ -88,7 +90,7 @@ Unit tests for Nemo TransferEngine
%files tests %files tests
%defattr(-,root,root,-) %defattr(-,root,root,-)
/opt/tests/nemo-transfer-engine-qt5/* /opt/tests/nemo-transfer-engine-qt5
%package doc %package doc
Summary: Documentation for Nemo TransferEngine Summary: Documentation for Nemo TransferEngine
...@@ -102,7 +104,7 @@ Documentation for Nemo TransferEngine ...@@ -102,7 +104,7 @@ Documentation for Nemo TransferEngine
%files doc %files doc
%defattr(-,root,root,-) %defattr(-,root,root,-)
%{_datadir}/doc/nemo-transferengine-qt5/* %{_datadir}/doc/%{name}
...@@ -122,6 +124,9 @@ mkdir -p %{buildroot}/%{_datadir}/nemo-transferengine ...@@ -122,6 +124,9 @@ mkdir -p %{buildroot}/%{_datadir}/nemo-transferengine
mkdir -p %{buildroot}/%{_docdir}/%{name} mkdir -p %{buildroot}/%{_docdir}/%{name}
cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/ cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/
mkdir -p %{buildroot}%{_datadir}/mapplauncherd/privileges.d
install -m 644 -p %{SOURCE1} %{buildroot}%{_datadir}/mapplauncherd/privileges.d
%define def_uid $(grep "^UID_MIN" /etc/login.defs | tr -s " " | cut -d " " -f2) %define def_uid $(grep "^UID_MIN" /etc/login.defs | tr -s " " | cut -d " " -f2)
%define def_user $(getent passwd %def_uid | sed 's/:.*//') %define def_user $(getent passwd %def_uid | sed 's/:.*//')
%define db_file /home/%{def_user}/.local/nemo-transferengine/transferdb.sqlite %define db_file /home/%{def_user}/.local/nemo-transferengine/transferdb.sqlite
...@@ -130,7 +135,7 @@ cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/ ...@@ -130,7 +135,7 @@ cp -R doc/html/* %{buildroot}/%{_docdir}/%{name}/
%post -n libnemotransferengine-qt5 %post -n libnemotransferengine-qt5
/sbin/ldconfig /sbin/ldconfig
%post -n nemo-transferengine-qt5 %post -n %{name}
if [ -n "%{te_pid}" ] if [ -n "%{te_pid}" ]
then then
kill -s 10 %{te_pid} kill -s 10 %{te_pid}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment