Bug-fix : native library resolving logic

[platform/core/dotnet/launcher.git] / packaging / dotnet-launcher.spec

diff --git a/packaging/dotnet-launcher.spec b/packaging/dotnet-launcher.spec
index b4067b6..f7d3298 100644 (file)
--- a/packaging/dotnet-launcher.spec
+++ b/packaging/dotnet-launcher.spec
@@ -1,6 +1,6 @@
 Name:       dotnet-launcher
 Summary:    Launchpad plugin for dotnet apps
-Version:    6.0.0
+Version:    6.0.9
 Release:    1
 Group:      Application Framework/Application State Management
 License:    Apache-2.0
@@ -20,9 +20,8 @@ BuildRequires: pkgconfig(pkgmgr-installer)
 BuildRequires: pkgconfig(glib-2.0)
 BuildRequires: pkgconfig(libsmack)
 BuildRequires: pkgconfig(capi-appfw-app-common)
-BuildRequires: pkgconfig(storage)
 BuildRequires: pkgconfig(jsoncpp)
-BuildRequires: pkgconfig(openssl1.1)
+BuildRequires: pkgconfig(openssl3)
 BuildRequires: pkgconfig(libsystemd)
 BuildRequires: pkgconfig(libtzplatform-config)
 BuildRequires: sqlite-devel
@@ -62,11 +61,15 @@ Requires(preun): /usr/bin/systemctl
 %define _dotnet_dir /opt/usr/dotnet
 %define _readonly_app_update_dir /opt/usr/dotnet/apps
 %define _system_base_addr_file /opt/usr/dotnet.system.base.addr
-
-%define _ibc_data_dir /usr/share/dotnet.tizen/ibcdata
 %define _tizen_preload_dir /usr/share/dotnet.tizen/preload
 
-%define _default_base_addr_start 0x3000000
+%ifarch x86_64 aarch64
+%define _default_base_addr_start 0x6000000000
+%endif
+
+%ifarch %{arm}
+%define _default_base_addr_start 0x30000000
+%endif
 
 %define _rw_update_scripts_dir /usr/share/upgrade/scripts
 %define _rw_dotnet_update_script 715.dotnet_regen_app_ni.patch.sh
@@ -109,6 +112,11 @@ export CXXFLAGS=$(echo $CXXFLAGS | sed -e 's/--target=i686/--target=i586/')
 %endif
 %endif
 
+%ifarch x86_64 aarch64
+export CFLAGS+=" -DBIT64 -DHOST_64BIT "
+export CXXFLAGS+=" -DBIT64 -DHOST_64BIT "
+%endif
+
 dotnet msbuild Managed /t:clean
 dotnet msbuild Managed /t:restore /p:RestoreSources=/nuget
 dotnet msbuild Managed /p:Configuration=Release
@@ -165,9 +173,6 @@ ln -sf %{_libdir}/libsqlite3.so.0 %{buildroot}%{_native_lib_dir}/libsqlite3.so
 mkdir -p %{buildroot}%{_tmpfilesdir}
 install -m 0644 %{name}.conf %{buildroot}%{_tmpfilesdir}/%{name}.conf
 
-mkdir -p %{buildroot}%{_ibc_data_dir}
-unzip packaging/ibcdata_%{_arch}.zip -d %{buildroot}%{_ibc_data_dir}
-
 mkdir -p %{buildroot}%{_tizen_preload_dir}
 mv packaging/10.Dotnet.Launcher.preload %{buildroot}%{_tizen_preload_dir}
 
@@ -184,17 +189,14 @@ install -m 0755 packaging/%{_rw_dotnet_update_script} %{buildroot}/%{_rw_update_
 %post
 mkdir -p /opt/etc/skel/.dotnet
 chsmack -t -a User::App::Shared /opt/etc/skel/.dotnet
-ln -sf /usr/bin/dotnet-loader /usr/bin/dotnet-nui-loader
-chsmack -a User /usr/bin/dotnet-nui-loader
+ln -sf /usr/bin/dotnet-loader /usr/bin/dotnet-uts-loader
+chsmack -a User /usr/bin/dotnet-uts-loader
 
 %files
 %manifest dotnet-launcher.manifest
 %{_loaderdir}/dotnet.loader
 %{_loaderdir}/dotnet.launcher
 %{_loaderdir}/dotnet.debugger
-%{_loaderdir}/dotnet-nui.loader
-%{_loaderdir}/dotnet-nui.launcher
-%{_loaderdir}/dotnet-nui.debugger
 %{_native_lib_dir}/libsqlite3.so
 %{_bindir}/tpatool
 %{_bindir}/dotnettool
@@ -210,13 +212,14 @@ chsmack -a User /usr/bin/dotnet-nui-loader
 %{_libdir}/libdotnet_launcher_core.so
 %{_libdir}/libni_common.so
 %{_libdir}/libtac_common.so
+%{_libdir}/libprofile_common.so
+%{_libdir}/libprivilege_common.so
 %{_libdir}/libmulti_target_resolver.so
 %{_tmpfilesdir}/%{name}.conf
 /usr/share/parser-plugins/dotnet-launcher.info
 %{_framework_dir}/Tizen.Runtime.dll
 %{_dotnet_dir}
 %{_readonly_app_update_dir}
-%{_ibc_data_dir}
 %{_tizen_preload_dir}
 %{_rw_update_scripts_dir}/%{_rw_dotnet_update_script}
 %if 0%{_build_dotnet_plugin}
@@ -228,11 +231,16 @@ chsmack -a User /usr/bin/dotnet-nui-loader
 %defattr(-,root,root,-)
 %{_includedir}/ni_common.h
 %{_includedir}/tac_common.h
+%{_includedir}/tac_installer.h
+%{_includedir}/profile_common.h
+%{_includedir}/privilege_common.h
 %{_includedir}/dotnet_launcher_plugin.h
 %{_includedir}/coreclr_host.h
 %{_libdir}/libdotnet_launcher_util.so
 %{_libdir}/libni_common.so
 %{_libdir}/libtac_common.so
+%{_libdir}/libprofile_common.so
+%{_libdir}/libprivilege_common.so
 %{_libdir}/pkgconfig/dotnet-launcher.pc
 %{_framework_dir}/Tizen.Runtime.pdb