tizen: Add additional unit for "unified" user session

[platform/core/security/pubkey-pinning.git] / packaging / pubkey-pinning.spec

diff --git a/packaging/pubkey-pinning.spec b/packaging/pubkey-pinning.spec
index e043c0f..b4dc915 100644 (file)
--- a/packaging/pubkey-pinning.spec
+++ b/packaging/pubkey-pinning.spec
@@ -92,7 +92,8 @@ export LDFLAGS+="-Wl,--rpath=%_prefix/lib"
 %endif
         -DCXXABI=cxx11 \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
-        -DSYSTEMD_UNIT_DIR=%_unitdir_user
+        -DSYSTEMD_UNIT_DIR=%_unitdir_user \
+        -DSYSTEMD_UNIT_SYSTEM_DIR=%_unitdir
 
 make %{?_smp_mflags}
 
@@ -115,6 +116,10 @@ pushd %{buildroot}%_unitdir_user/
 mv %name-popup.* %{_builddir}/%{name}-%{version}
 popd
 
+pushd %{buildroot}%_unitdir/
+mv %name-popup@.* %{_builddir}/%{name}-%{version}
+popd
+
 make clean
 
 %{!?build_type:%define build_type "Release"}
@@ -128,14 +133,17 @@ make clean
 %endif
         -DCXXABI=cxx03 \
         -DCMAKE_VERBOSE_MAKEFILE=ON \
-        -DSYSTEMD_UNIT_DIR=%_unitdir_user
+        -DSYSTEMD_UNIT_DIR=%_unitdir_user \
+        -DSYSTEMD_UNIT_SYSTEM_DIR=%_unitdir
 
 make %{?_smp_mflags}
 
 %install
 %make_install
 mkdir -p %buildroot%_unitdir_user/sockets.target.wants
+mkdir -p %buildroot%_unitdir/user-sockets@.target.wants
 ln -sf ../%name-popup-deprecated.socket %buildroot%_unitdir_user/sockets.target.wants/%name-popup-deprecated.socket
+ln -sf ../%name-popup-deprecated@.socket %buildroot%_unitdir/user-sockets@.target.wants/%name-popup-deprecated@.socket
 %find_lang pubkey-pinning
 
 #move all we have build for cxx11 abi
@@ -147,8 +155,11 @@ for FILE in tpkp-internal*; do mv "$FILE" "%{buildroot}%{_bindir}/$FILE"; done
 mv tpkp-popup %{buildroot}%{_bindir}
 mv %name-popup.socket  %{buildroot}%_unitdir_user
 mv %name-popup.service  %{buildroot}%_unitdir_user
+mv %name-popup@.socket  %{buildroot}%_unitdir
+mv %name-popup@.service  %{buildroot}%_unitdir
 mv tpkp*.pc %{buildroot}%{_libdir}/pkgconfig/
 ln -sf %_unitdir_user/%name-popup.socket %buildroot%_unitdir_user/sockets.target.wants/%name-popup.socket
+ln -sf %_unitdir/%name-popup@.socket %buildroot%_unitdir/user-sockets@.target.wants/%name-popup@.socket
 popd
 
 %post
@@ -211,6 +222,9 @@ systemctl daemon-reload
 %_unitdir_user/%name-popup-deprecated.service
 %_unitdir_user/%name-popup-deprecated.socket
 %_unitdir_user/sockets.target.wants/%name-popup-deprecated.socket
+%_unitdir/%name-popup-deprecated@.service
+%_unitdir/%name-popup-deprecated@.socket
+%_unitdir/user-sockets@.target.wants/%name-popup-deprecated@.socket
 %_bindir/tpkp-popup-deprecated
 
 %files -f pubkey-pinning.lang
@@ -227,6 +241,9 @@ systemctl daemon-reload
 %_unitdir_user/%name-popup.service
 %_unitdir_user/%name-popup.socket
 %_unitdir_user/sockets.target.wants/%name-popup.socket
+%_unitdir/%name-popup@.service
+%_unitdir/%name-popup@.socket
+%_unitdir/user-sockets@.target.wants/%name-popup@.socket
 %_bindir/tpkp-popup
 
 %files devel