From: Łukasz Stelmach <l.stelmach@samsung.com>
Date: Mon, 6 May 2024 07:33:52 +0000 (+0200)
Subject: Use upstream _userunitdir macro
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fheads%2Ftizen;p=platform%2Fcore%2Fappfw%2Flaunchpad.git

Use upstream _userunitdir macro

The _unitdir_user had been defined in Tizen before _userunitdir was
available upstream. The macros are equivalent. Switch to the latter so
the _unitdir_user can be dropped from Tizen.

Change-Id: Ida3bbfc50eddc837defe474b47559e0a4d004f63
Signed-off-by: Łukasz Stelmach <l.stelmach@samsung.com>
---

diff --git a/packaging/launchpad.spec b/packaging/launchpad.spec
index d6b3b93..9f2c7aa 100644
--- a/packaging/launchpad.spec
+++ b/packaging/launchpad.spec
@@ -164,12 +164,12 @@ rm -rf %{buildroot}
 
 
 %make_install
-mkdir -p %{buildroot}%{_unitdir_user}/basic.target.wants
-mkdir -p %{buildroot}%{_unitdir_user}/sockets.target.wants
-install -m 0644 %SOURCE101 %{buildroot}%{_unitdir_user}/launchpad-process-pool.service
-install -m 0644 %SOURCE102 %{buildroot}%{_unitdir_user}/launchpad-process-pool.socket
-ln -sf ../launchpad-process-pool.socket %{buildroot}%{_unitdir_user}/sockets.target.wants/launchpad-process-pool.socket
-ln -sf ../launchpad-process-pool.service %{buildroot}%{_unitdir_user}/basic.target.wants/launchpad-process-pool.service
+mkdir -p %{buildroot}%{_userunitdir}/basic.target.wants
+mkdir -p %{buildroot}%{_userunitdir}/sockets.target.wants
+install -m 0644 %SOURCE101 %{buildroot}%{_userunitdir}/launchpad-process-pool.service
+install -m 0644 %SOURCE102 %{buildroot}%{_userunitdir}/launchpad-process-pool.socket
+ln -sf ../launchpad-process-pool.socket %{buildroot}%{_userunitdir}/sockets.target.wants/launchpad-process-pool.socket
+ln -sf ../launchpad-process-pool.service %{buildroot}%{_userunitdir}/basic.target.wants/launchpad-process-pool.service
 
 %post
 ln -sf /usr/bin/false /usr/bin/process-pool
@@ -187,10 +187,10 @@ fi
 %manifest launchpad.manifest
 %license LICENSE
 %{_prefix}/share/aul/default.debugger
-%{_unitdir_user}/launchpad-process-pool.service
-%{_unitdir_user}/launchpad-process-pool.socket
-%{_unitdir_user}/sockets.target.wants/launchpad-process-pool.socket
-%{_unitdir_user}/basic.target.wants/launchpad-process-pool.service
+%{_userunitdir}/launchpad-process-pool.service
+%{_userunitdir}/launchpad-process-pool.socket
+%{_userunitdir}/sockets.target.wants/launchpad-process-pool.socket
+%{_userunitdir}/basic.target.wants/launchpad-process-pool.service
 %{_bindir}/launchpad-process-pool
 %{_prefix}/share/aul/launchpad.conf
 %{_sysconfdir}/package-manager/parserlib/liblaunchpad-parser.so