Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb50027' into 'master'
[aarch64] Fix location of systemd unit files. Contributes to JB#50027

See merge request mer-core/maliit-framework!12
  • Loading branch information
xfade committed Jul 8, 2020
2 parents d36c726 + 785dbcd commit 867eb69
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions rpm/maliit-framework-wayland.spec
Expand Up @@ -20,6 +20,7 @@ BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(mce)
BuildRequires: fdupes
BuildRequires: pkgconfig(qt5-boostable)
BuildRequires: systemd
Requires: mapplauncherd-qt5
Provides: maliit-framework
Conflicts: maliit-framework-x11
Expand Down Expand Up @@ -89,7 +90,7 @@ pushd maliit-framework
CONFIG+=noxcb \
CONFIG+=enable-mce

make %{?jobs:-j%jobs}
%make_build
popd

%install
Expand All @@ -98,9 +99,9 @@ pushd maliit-framework
%qmake_install
popd
install -D -m 0644 maliit-server.sh %{buildroot}%{_sysconfdir}/profile.d/maliit-server.sh
install -D -m 0644 maliit-server.service %{buildroot}%{_libdir}/systemd/user/maliit-server.service
mkdir -p %{buildroot}%{_libdir}/systemd/user/user-session.target.wants
ln -s ../maliit-server.service %{buildroot}%{_libdir}/systemd/user/user-session.target.wants/
install -D -m 0644 maliit-server.service %{buildroot}%{_userunitdir}/maliit-server.service
mkdir -p %{buildroot}%{_userunitdir}/user-session.target.wants
ln -s ../maliit-server.service %{buildroot}%{_userunitdir}/user-session.target.wants/
mkdir %{buildroot}%{_libdir}/maliit
mkdir %{buildroot}%{_datadir}/maliit

Expand All @@ -118,8 +119,8 @@ mkdir %{buildroot}%{_datadir}/maliit
%{_libdir}/libmaliit-plugins.so*
%{_datadir}/dbus-1/services/org.maliit.server.service
%config %{_sysconfdir}/profile.d/maliit-server.sh
%{_libdir}/systemd/user/maliit-server.service
%{_libdir}/systemd/user/user-session.target.wants/maliit-server.service
%{_userunitdir}/maliit-server.service
%{_userunitdir}/user-session.target.wants/maliit-server.service
%dir %{_libdir}/maliit
%dir %{_datadir}/maliit

Expand Down

0 comments on commit 867eb69

Please sign in to comment.