From 3b9eead380dae0f5315e7c085e2d8dcd543af399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= <matti.lehtimaki@jolla.com>
Date: Wed, 8 Jul 2020 12:04:31 +0300
Subject: [PATCH] [aarch64] Fix location of systemd unit files. Contributes to
 JB#50027

---
 rpm/mms-engine.spec | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/rpm/mms-engine.spec b/rpm/mms-engine.spec
index c9ce665..6fb14c7 100644
--- a/rpm/mms-engine.spec
+++ b/rpm/mms-engine.spec
@@ -2,7 +2,6 @@ Name:     mms-engine
 Summary:  MMS engine
 Version:  1.0.68
 Release:  1
-Group:    Communications/Telephony and IM
 License:  GPLv2
 URL:      https://git.sailfishos.org/mer-core/mms-engine
 Source0:  %{name}-%{version}.tar.bz2
@@ -32,6 +31,7 @@ BuildRequires: pkgconfig(libglibutil) >= 1.0.11
 BuildRequires: pkgconfig(libdbusaccess)
 #BuildRequires: pkgconfig(ImageMagick)
 BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: systemd
 
 %define src mms-engine
 %define exe mms-engine
@@ -40,7 +40,6 @@ BuildRequires: pkgconfig(Qt5Gui)
 %define dbusconfig %{_datadir}/dbus-1/system-services
 %define dbuspolicy %{_sysconfdir}/dbus-1/system.d
 %define glibschemas  %{_datadir}/glib-2.0/schemas
-%define systemdconfig %{_libdir}/systemd/system
 
 # Activation method:
 %define pushconfig %{_sysconfdir}/ofono/push_forwarder.d
@@ -51,7 +50,6 @@ of MMS messages.
 
 %package tools
 Summary:    MMS tools
-Group:      Development/Tools
 
 %description tools
 MMS command line utilities
@@ -67,14 +65,14 @@ make -C mms-send KEEP_SYMBOLS=1 release
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_sbindir}
-mkdir -p %{buildroot}%{systemdconfig}
+mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{dbusconfig}
 mkdir -p %{buildroot}%{dbuspolicy}
 mkdir -p %{buildroot}%{pushconfig}
 mkdir -p %{buildroot}%{glibschemas}
 mkdir -p %{buildroot}%{_prefix}/bin/
 cp %{src}/build/release/%{exe} %{buildroot}%{_sbindir}/
-cp %{src}/dbus-%{dbusname}.service %{buildroot}%{systemdconfig}/
+cp %{src}/dbus-%{dbusname}.service %{buildroot}%{_unitdir}/
 cp %{src}/%{dbusname}.service %{buildroot}%{dbusconfig}/
 cp %{src}/%{dbusname}.dbus.conf %{buildroot}%{dbuspolicy}/%{dbusname}.conf
 cp %{src}/%{dbusname}.push.conf %{buildroot}%{pushconfig}/%{dbusname}.conf
@@ -97,7 +95,7 @@ make -C mms-lib/test test
 %config %{dbuspolicy}/%{dbusname}.conf
 %config %{pushconfig}/%{dbusname}.conf
 %{dbusconfig}/%{dbusname}.service
-%{systemdconfig}/dbus-%{dbusname}.service
+%{_unitdir}/dbus-%{dbusname}.service
 %{_sbindir}/%{exe}
 
 %files tools