Fix spec for building 64 bit tv emul

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

diff --git a/packaging/push.spec b/packaging/push.spec
index 439af7f..393808a 100644 (file)
--- a/packaging/push.spec
+++ b/packaging/push.spec
@@ -20,15 +20,18 @@ Requires(post): /usr/bin/sqlite3
 Requires(postun): /sbin/ldconfig
 BuildRequires:  pkgconfig(libtzplatform-config)
 
-# There are not ready for .so files of tv/wearable aarch64 and x86_64
+
+# There are not ready for .so files of wearable aarch64 and x86_64
 %if "%{?profile}" == "wearable"
 ExcludeArch: aarch64 x86_64
 %endif
 
+# There are not ready for .so files of tv aarch64
 %if "%{?profile}" == "tv"
 ExcludeArch: aarch64
 %endif
 
+
 %if %{_support_weblog}
 BuildRequires:  pkgconfig(zlib)
 BuildRequires:  pkgconfig(json-glib-1.0)
@@ -195,33 +198,46 @@ Conflicts:        %{name}-tool-profile_common
 Push service tool for wearable
 %endif
 
+
 %define _upgrade_script_path /usr/share/upgrade/scripts/
 %define _upgrade_script 500.sppc.sh
 
+
 %prep
 %setup -q
 
+
 %build
 
+
 %install
 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 || ivi || common || "undefined"
-%if "%{?profile}" != "wearable" && "%{?profile}" != "tv"
+# 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
 
-%endif //%ifarch %{ix86} || %{arm}
 
 mkdir -p %{buildroot}/usr/share/licenses/%{name}
 cp -f LICENSE %{buildroot}/usr/share/licenses/%{name}
@@ -242,6 +258,7 @@ cp -f scripts/%{_upgrade_script} %{buildroot}%{_upgrade_script_path}
 
 mkdir -p %{buildroot}/usr/share/push
 
+
 %ifarch %{arm}
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -297,6 +314,7 @@ popd
 
 %endif //%ifarch %{arm}
 
+
 %ifarch aarch64
 
 pushd aarch64/lib64/
@@ -308,12 +326,13 @@ popd
 pushd aarch64/share/push/
 for FILE in *.cer; do cp -a "$FILE" "%{buildroot}/usr/share/push/$FILE"; done
 popd
-
 %if %{_support_weblog}
        aarch64/bin/pushlog_tool
 %endif
+
 %endif
 
+
 %ifarch %{ix86}
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -371,10 +390,11 @@ popd
 
 
 %ifarch x86_64
-pushd x86_64/lib64/
+
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if mobile || ivi || common || "undefined"
 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv"
+pushd x86_64/lib64/
 for FILE in libpush.so*; do cp -a "$FILE" "%{buildroot}%{_libdir}/$FILE"; done
 popd
 pushd x86_64/bin/
@@ -388,13 +408,26 @@ popd
 %endif
 %endif
 
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if tv || "undefined"
+%if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+pushd x86_64_tv/lib64/
+for FILE in libpush.so*; do cp -a "$FILE" "%{buildroot}%{_libdir}/$FILE.tv"; done
+popd
+pushd x86_64_tv/bin/
+for FILE in push*; do cp -a "$FILE" "%{buildroot}%{_bindir}/$FILE.tv"; done
+popd
+pushd x86_64_tv/share/push/
+for FILE in *.cer; do cp -a "$FILE" "%{buildroot}/usr/share/push/$FILE.tv"; done
+popd
+%if %{_support_weblog}
+       x86_64_tv/bin/pushlog_tool
+%endif
+%endif
 
 %endif //%ifarch %{x86_64}
 
 
-
-
-
 %post bin
 mkdir -p %{TZ_SYS_GLOBALUSER_DB}
 sqlite3 %{TZ_SYS_GLOBALUSER_DB}/.push.db "PRAGMA journal_mode = PERSIST; create table a(a); drop table a;" > /dev/null
@@ -406,17 +439,20 @@ chmod 644 %{TZ_SYS_GLOBALUSER_DB}/.push.db-journal
 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 || ivi || common || "undefined"
-%if "%{?profile}" != "wearable" || "%{?profile}" != "tv"
+# 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
 # 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
@@ -433,12 +469,13 @@ pushd %{_libdir}
 for FILE in libpush.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done
 popd
 /sbin/ldconfig
-
 %endif
 
+
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if wearable || "undefined"
 %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
+
 %post bin-profile_wearable
 pushd %{_bindir}
 for FILE in push*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done
@@ -504,7 +541,9 @@ popd
 
 %endif
 
+
 %ifarch %{ix86} || %{arm}
+
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if tv || "undefined"
 %if "%{?profile}" != "mobile" && "%{?profile}" != "wearable" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
@@ -523,6 +562,7 @@ popd
 
 %endif
 
+
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if wearable || "undefined"
 %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
@@ -543,6 +583,30 @@ 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"
+
+%files -n libpush-profile_tv
+%manifest libpush.manifest
+%attr(755,root,root) %{_libdir}/libpush.so*.tv
+
+%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
+
+%endif
+
+%endif //x86_64
+
+
 %changelog
 * Sat Nov 3 2012 Jooseok Park <jooseok.park@samsung.com> - 0.2.26
 - Prevent bug fixed(out-of bounds read, dead code,..)

diff --git a/x86_64_tv/bin/push_tool b/x86_64_tv/bin/push_tool
index 123fe1a..80d3ef2 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 3d03de0..a5a0331 100755 (executable)
Binary files a/x86_64_tv/bin/pushd and b/x86_64_tv/bin/pushd differ