Removed lazy mount dependancy

Change-Id: I7cc5fadc7c5942c3726fb8967b79db5413c47c3c
Signed-off-by: Younho Park <younho.park@samsung.com>

diff --git a/aarch64/bin/push_tool b/aarch64/bin/push_tool
index 2a20540..b53b69e 100755 (executable)
Binary files a/aarch64/bin/push_tool and b/aarch64/bin/push_tool differ

diff --git a/aarch64/bin/pushd b/aarch64/bin/pushd
index 2adf5e1..2f0662c 100755 (executable)
Binary files a/aarch64/bin/pushd and b/aarch64/bin/pushd differ

diff --git a/aarch64/lib64/libpush.so.0.2.12 b/aarch64/lib64/libpush.so.0.2.12
index 43fc04d..ddfa1e5 100644 (file)
Binary files a/aarch64/lib64/libpush.so.0.2.12 and b/aarch64/lib64/libpush.so.0.2.12 differ

diff --git a/arm/bin/push_tool b/arm/bin/push_tool
index fecd14e..c5f94bf 100755 (executable)
Binary files a/arm/bin/push_tool and b/arm/bin/push_tool differ

diff --git a/arm/bin/pushd b/arm/bin/pushd
index 1fbc75e..e504879 100755 (executable)
Binary files a/arm/bin/pushd and b/arm/bin/pushd differ

diff --git a/arm/lib/libpush.so.0.2.12 b/arm/lib/libpush.so.0.2.12
index 86c077c..135123a 100644 (file)
Binary files a/arm/lib/libpush.so.0.2.12 and b/arm/lib/libpush.so.0.2.12 differ

diff --git a/arm_tv/bin/push_tool b/arm_tv/bin/push_tool
index fecd14e..c5f94bf 100755 (executable)
Binary files a/arm_tv/bin/push_tool and b/arm_tv/bin/push_tool differ

diff --git a/arm_tv/bin/pushd b/arm_tv/bin/pushd
index 424e755..0ed9021 100755 (executable)
Binary files a/arm_tv/bin/pushd and b/arm_tv/bin/pushd differ

diff --git a/arm_tv/lib/libpush.so.0.2.12 b/arm_tv/lib/libpush.so.0.2.12
index 86c077c..135123a 100644 (file)
Binary files a/arm_tv/lib/libpush.so.0.2.12 and b/arm_tv/lib/libpush.so.0.2.12 differ

diff --git a/arm_wearable/bin/push_tool b/arm_wearable/bin/push_tool
index fecd14e..c5f94bf 100755 (executable)
Binary files a/arm_wearable/bin/push_tool and b/arm_wearable/bin/push_tool differ

diff --git a/arm_wearable/bin/pushd b/arm_wearable/bin/pushd
index 0a991ce..913d03f 100755 (executable)
Binary files a/arm_wearable/bin/pushd and b/arm_wearable/bin/pushd differ

diff --git a/arm_wearable/lib/libpush.so.0.2.12 b/arm_wearable/lib/libpush.so.0.2.12
index 00cb36e..81da897 100644 (file)
Binary files a/arm_wearable/lib/libpush.so.0.2.12 and b/arm_wearable/lib/libpush.so.0.2.12 differ

diff --git a/packaging/push.spec b/packaging/push.spec
index 393808a..4da2691 100644 (file)
--- a/packaging/push.spec
+++ b/packaging/push.spec
@@ -8,13 +8,12 @@
 
 Name:       push
 Summary:    Push services and client library
-Version:    0.4.69
+Version:    0.4.70
 Release:    1
 Group:      Application Framework/Service
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
 Source1:    pushd.service
-Source2:    pushd.path
 Requires(post): /sbin/ldconfig
 Requires(post): /usr/bin/sqlite3
 Requires(postun): /sbin/ldconfig
@@ -214,29 +213,7 @@ Push service tool for wearable
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/pushd.service
-
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if mobile //Lazy mount is for mobile only
-%if "%{?profile}" == "mobile"
-install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/pushd.path
-%endif
-
-%ifarch %{ix86} || %{arm}
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if not mobile //Lazy mount is for mobile only
-%if "%{?profile}" != "mobile"
 %install_service multi-user.target.wants pushd.service
-%endif
-%endif //%ifarch %{ix86} || %{arm}
-
-%ifarch x86_64
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if wearable || tv || "undefined"
-%if "%{?profile}" != "mobile" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
-#install -m 0644 %{SOURCE1} %{buildroot}%{_unitdir}/multi-user.target.wants/pushd.service
-%install_service multi-user.target.wants pushd.service
-%endif
-%endif //%ifarch x86_64
 
 
 mkdir -p %{buildroot}/usr/share/licenses/%{name}
@@ -440,13 +417,6 @@ chsmack -a "*" %{TZ_SYS_GLOBALUSER_DB}/.push.db
 chsmack -a "*" %{TZ_SYS_GLOBALUSER_DB}/.push.db-journal
 
 
-# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
-# if mobile //Lazy mount is for mobile only
-%if "%{?profile}" == "mobile"
-ln -sf ../pushd.path  %{_unitdir}/multi-user.target.wants/
-%endif
-
-
 %ifarch %{ix86} || %{arm}
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -498,14 +468,40 @@ popd
 %endif //%ifarch %{ix86} || %{arm}
 
 
+%ifarch x86_64
+
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if tv || "undefined"
+%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+
+%post bin-profile_tv
+pushd %{_bindir}
+for FILE in push*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
+popd
+pushd /usr/share/push/
+for FILE in Push*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
+popd
+
+%post tool-profile_tv
+ln -sf push_tool.tv %{_bindir}/push_tool
+
+%post -n libpush-profile_tv
+pushd %{_libdir}
+for FILE in libpush.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
+popd
+/sbin/ldconfig
+%endif
+%endif
+
+
 %files -n libpush
 %manifest libpush.manifest
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if mobile || ivi || common || "undefined"
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv"
 %attr(755,root,root) %{_libdir}/libpush.so*
-%exclude %{_libdir}/libpush.so*.tv
-%exclude %{_libdir}/libpush.so*.wearable
+#%exclude %{_libdir}/libpush.so*.tv
+#%exclude %{_libdir}/libpush.so*.wearable
 %endif
 
 %files -n libpush-devel
@@ -517,6 +513,7 @@ popd
 %{_unitdir}/pushd.service
 %attr(644,root,root) /usr/share/licenses/%{name}/LICENSE
 %attr(755,root,root) %{_upgrade_script_path}%{_upgrade_script}
+%{_unitdir}/multi-user.target.wants/pushd.service
 
 %files tool
 %manifest push-tool.manifest
@@ -534,7 +531,6 @@ popd
 %files bin-profile_common
 %{_bindir}/pushd
 %attr(600,service_fw,service_fw) /usr/share/push/PushServerTrust.cer
-%{_unitdir}/pushd.path
 
 %files tool-profile_common
 %{_bindir}/push_tool
@@ -555,7 +551,7 @@ popd
 %files bin-profile_tv
 %{_bindir}/pushd.tv
 %attr(600,service_fw,service_fw) /usr/share/push/PushServerTrust.cer.tv
-%{_unitdir}/multi-user.target.wants/pushd.service
+
 
 %files tool-profile_tv
 %{_bindir}/push_tool.tv
@@ -574,7 +570,7 @@ popd
 %files bin-profile_wearable
 %{_bindir}/pushd.wearable
 %attr(600,service_fw,service_fw) /usr/share/push/PushServerTrust.cer.wearable
-%{_unitdir}/multi-user.target.wants/pushd.service
+
 
 %files tool-profile_wearable
 %{_bindir}/push_tool.wearable
@@ -597,7 +593,7 @@ popd
 %files bin-profile_tv
 %{_bindir}/pushd.tv
 %attr(600,service_fw,service_fw) /usr/share/push/PushServerTrust.cer.tv
-%{_unitdir}/multi-user.target.wants/pushd.service
+
 
 %files tool-profile_tv
 %{_bindir}/push_tool.tv

diff --git a/packaging/pushd.path b/packaging/pushd.path
deleted file mode 100644 (file)
index 498886c..0000000
--- a/packaging/pushd.path
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=pushd path activation
-
-[Path]
-PathExists=/run/.unlock_mnt

diff --git a/packaging/pushd.service b/packaging/pushd.service
index ad1c085..49dd363 100644 (file)
--- a/packaging/pushd.service
+++ b/packaging/pushd.service
@@ -1,5 +1,6 @@
 [Unit]
 Description=Push daemon
+After=dbus.service
 
 [Service]
 Type=simple

diff --git a/x86/bin/push_tool b/x86/bin/push_tool
index 72b5918..6b4fee8 100755 (executable)
Binary files a/x86/bin/push_tool and b/x86/bin/push_tool differ

diff --git a/x86/bin/pushd b/x86/bin/pushd
index 2aa5907..7761069 100755 (executable)
Binary files a/x86/bin/pushd and b/x86/bin/pushd differ

diff --git a/x86/lib/libpush.so.0.2.12 b/x86/lib/libpush.so.0.2.12
index 5cf9521..ff7e692 100644 (file)
Binary files a/x86/lib/libpush.so.0.2.12 and b/x86/lib/libpush.so.0.2.12 differ

diff --git a/x86_64/bin/push_tool b/x86_64/bin/push_tool
index 80d3ef2..e23386f 100755 (executable)
Binary files a/x86_64/bin/push_tool and b/x86_64/bin/push_tool differ

diff --git a/x86_64/bin/pushd b/x86_64/bin/pushd
index 2da40f4..b6a00ea 100755 (executable)
Binary files a/x86_64/bin/pushd and b/x86_64/bin/pushd differ

diff --git a/x86_64/lib64/libpush.so.0.2.12 b/x86_64/lib64/libpush.so.0.2.12
index b382c77..83a2229 100644 (file)
Binary files a/x86_64/lib64/libpush.so.0.2.12 and b/x86_64/lib64/libpush.so.0.2.12 differ

diff --git a/x86_64_tv/bin/push_tool b/x86_64_tv/bin/push_tool
index 80d3ef2..e23386f 100755 (executable)
Binary files a/x86_64_tv/bin/push_tool and b/x86_64_tv/bin/push_tool differ

diff --git a/x86_64_tv/bin/pushd b/x86_64_tv/bin/pushd
index a5a0331..8821e7e 100755 (executable)
Binary files a/x86_64_tv/bin/pushd and b/x86_64_tv/bin/pushd differ

diff --git a/x86_64_tv/lib64/libpush.so.0.2.12 b/x86_64_tv/lib64/libpush.so.0.2.12
index b382c77..83a2229 100755 (executable)
Binary files a/x86_64_tv/lib64/libpush.so.0.2.12 and b/x86_64_tv/lib64/libpush.so.0.2.12 differ

diff --git a/x86_tv/bin/push_tool b/x86_tv/bin/push_tool
index 72b5918..6b4fee8 100755 (executable)
Binary files a/x86_tv/bin/push_tool and b/x86_tv/bin/push_tool differ

diff --git a/x86_tv/bin/pushd b/x86_tv/bin/pushd
index c2f25cf..c7e366b 100755 (executable)
Binary files a/x86_tv/bin/pushd and b/x86_tv/bin/pushd differ

diff --git a/x86_tv/lib/libpush.so.0.2.12 b/x86_tv/lib/libpush.so.0.2.12
index 5cf9521..ff7e692 100644 (file)
Binary files a/x86_tv/lib/libpush.so.0.2.12 and b/x86_tv/lib/libpush.so.0.2.12 differ

diff --git a/x86_wearable/bin/push_tool b/x86_wearable/bin/push_tool
index 72b5918..6b4fee8 100755 (executable)
Binary files a/x86_wearable/bin/push_tool and b/x86_wearable/bin/push_tool differ

diff --git a/x86_wearable/bin/pushd b/x86_wearable/bin/pushd
index cf663b5..49a21f4 100755 (executable)
Binary files a/x86_wearable/bin/pushd and b/x86_wearable/bin/pushd differ

diff --git a/x86_wearable/lib/libpush.so.0.2.12 b/x86_wearable/lib/libpush.so.0.2.12
index 1faa0c2..eb0ce97 100644 (file)
Binary files a/x86_wearable/lib/libpush.so.0.2.12 and b/x86_wearable/lib/libpush.so.0.2.12 differ