From 034fc8bbd18e20fd5b40cbd3a25b9555a96d9bc8 Mon Sep 17 00:00:00 2001 From: "Seungho, Baek" Date: Wed, 18 Dec 2019 13:16:42 +0900 Subject: [PATCH] Revert "[Tizen] (RPM) Do not copy build library in profile RPM if building only one profile" This reverts commit 39bfdd95b601864eccf48b0e928a2ad9fc2b4f07. Change-Id: I971035da7476f48ac00c6a7f35abc838aa17d484 --- packaging/dali-adaptor.spec | 38 ++++++++------------------------------ 1 file changed, 8 insertions(+), 30 deletions(-) diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index 17be7a5..a51b501 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -30,9 +30,6 @@ Requires: giflib Provides: libdali-adaptor-cxx11.so Provides: libdali-adaptor-cxx11.so.0 Provides: libdali-adaptor-cxx11.so.0.0.0 -Provides: libdali-adaptor.so -Provides: libdali-adaptor.so.0 -Provides: libdali-adaptor.so.0.0.0 %define tizen_platform_config_supported 1 BuildRequires: pkgconfig(libtzplatform-config) @@ -133,7 +130,6 @@ Conflicts: %{name}-profile_tv Conflicts: %{name}-profile_wearable Conflicts: %{name}-profile_ivi Conflicts: %{name}-profile_common -Requires: %{name} %description profile_mobile The DALi Tizen Adaptor for mobile. %endif @@ -148,7 +144,6 @@ Conflicts: %{name}-profile_mobile Conflicts: %{name}-profile_wearable Conflicts: %{name}-profile_ivi Conflicts: %{name}-profile_common -Requires: %{name} %description profile_tv The DALi Tizen Adaptor for tv. %endif @@ -163,7 +158,6 @@ Conflicts: %{name}-profile_mobile Conflicts: %{name}-profile_tv Conflicts: %{name}-profile_ivi Conflicts: %{name}-profile_common -Requires: %{name} %description profile_wearable The DALi Tizen Adaptor for wearable. %endif @@ -178,7 +172,6 @@ Conflicts: %{name}-profile_mobile Conflicts: %{name}-profile_wearable Conflicts: %{name}-profile_tv Conflicts: %{name}-profile_common -Requires: %{name} %description profile_ivi The DALi Tizen Adaptor for ivi. %endif @@ -194,7 +187,6 @@ Conflicts: %{name}-profile_mobile Conflicts: %{name}-profile_wearable Conflicts: %{name}-profile_tv Conflicts: %{name}-profile_ivi -Requires: %{name} %description profile_common The DALi Tizen Adaptor for common. %endif @@ -399,10 +391,10 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" pushd mobile %make_install -%if "%{?profile}" != "mobile" pushd %{buildroot}%{_libdir} -cp libdali-adaptor.so.*.*.* libdali-adaptor.so.mobile # If we're only building this profile, then there's no need to copy the lib +cp libdali-adaptor.so.*.*.* libdali-adaptor.so.mobile popd +%if "%{?profile}" != "mobile" make clean # So that we can gather symbol/size information for only one profile if we're building all profiles %endif popd @@ -412,10 +404,10 @@ popd %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" pushd tv %make_install -%if "%{?profile}" != "tv" pushd %{buildroot}%{_libdir} -cp libdali-adaptor.so.*.*.* libdali-adaptor.so.tv # If we're only building this profile, then there's no need to copy the lib +cp libdali-adaptor.so.*.*.* libdali-adaptor.so.tv popd +%if "%{?profile}" != "tv" make clean # So that we can gather symbol/size information for only one profile if we're building all profiles %endif popd @@ -425,10 +417,10 @@ popd %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" pushd wearable %make_install -%if "%{?profile}" != "wearable" pushd %{buildroot}%{_libdir} -cp libdali-adaptor.so.*.*.* libdali-adaptor.so.wearable # If we're only building this profile, then there's no need to copy the lib +cp libdali-adaptor.so.*.*.* libdali-adaptor.so.wearable popd +%if "%{?profile}" != "wearable" make clean # So that we can gather symbol/size information for only one profile if we're building all profiles %endif popd @@ -438,10 +430,10 @@ popd %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" pushd ivi %make_install -%if "%{?profile}" != "ivi" pushd %{buildroot}%{_libdir} -cp libdali-adaptor.so.*.*.* libdali-adaptor.so.ivi # If we're only building this profile, then there's no need to copy the lib +cp libdali-adaptor.so.*.*.* libdali-adaptor.so.ivi popd +%if "%{?profile}" != "ivi" make clean # So that we can gather symbol/size information for only one profile if we're building all profiles %endif popd @@ -499,14 +491,11 @@ exit 0 ############################## # Mobile Profile Commands # if mobile || "undefined" -# No need to create a symbolic link on install required if only building this profile %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" %post profile_mobile -%if "%{?profile}" != "mobile" pushd %{_libdir} ln -sf libdali-adaptor.so.mobile libdali-adaptor.so.0.0.0 popd -%endif /sbin/ldconfig exit 0 @@ -517,14 +506,11 @@ exit 0 ############################## # TV Profile Commands -# No need to create a symbolic link on install required if only building this profile %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" %post profile_tv -%if "%{?profile}" != "tv" pushd %{_libdir} ln -sf libdali-adaptor.so.tv libdali-adaptor.so.0.0.0 popd -%endif /sbin/ldconfig exit 0 @@ -535,14 +521,11 @@ exit 0 ############################## # Wearable Profile Commands -# No need to create a symbolic link on install required if only building this profile %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" %post profile_wearable -%if "%{?profile}" != "wearable" pushd %{_libdir} ln -sf libdali-adaptor.so.wearable libdali-adaptor.so.0.0.0 popd -%endif /sbin/ldconfig exit 0 @@ -553,14 +536,11 @@ exit 0 ############################## # IVI Profile Commands -# No need to create a symbolic link on install required if only building this profile %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" %post profile_ivi -%if "%{?profile}" != "ivi" pushd %{_libdir} ln -sf libdali-adaptor.so.ivi libdali-adaptor.so.0.0.0 popd -%endif /sbin/ldconfig exit 0 @@ -637,10 +617,8 @@ exit 0 %files profile_wearable %manifest dali-adaptor.manifest %defattr(-,root,root,-) -%if "%{?profile}" != "wearable" %{_libdir}/libdali-adaptor.so.wearable %endif -%endif # if ivi ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" -- 2.7.4