From: hk57.kim Date: Mon, 24 Apr 2017 04:12:58 +0000 (+0900) Subject: [FIX] fix issue of overwrite sub package's files. X-Git-Tag: accepted/tizen/unified/20170510.183714^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F88%2F125188%2F5;p=platform%2Fcore%2Fconnectivity%2Fwifi-direct-manager.git [FIX] fix issue of overwrite sub package's files. - This is for Tizen 4.0. - If packages are connected with compat style and main/super package that contains same items with sub package, will overwrite it. - Change the installation sequence to main/super package first and sub package later. Change-Id: I5ef49185493137e0a874b2c265c0dc8630d02cc9 Signed-off-by: hk57.kim --- diff --git a/packaging/wifi-direct-manager.spec b/packaging/wifi-direct-manager.spec index 8bec370..f6b9c5c 100644 --- a/packaging/wifi-direct-manager.spec +++ b/packaging/wifi-direct-manager.spec @@ -109,8 +109,6 @@ Manager for handling wifi-direct functionalities for tv Summary: Wifi direct plugin for wpa supplicant Group: Network & Connectivity/Wireless Requires: %{name} = %{version}-%{release} -Requires: wifi-direct-plugin-wpasupplicant-compat = %{version}-%{release} -Recommends: wifi-direct-plugin-wpasupplicant-profile_common = %{version}-%{release} %description -n wifi-direct-plugin-wpasupplicant Wi-Fi direct manager plugin to abstract wpa_supplicant @@ -120,11 +118,7 @@ Wi-Fi direct manager plugin to abstract wpa_supplicant %package -n wifi-direct-plugin-wpasupplicant-profile_common Summary: Wifi direct plugin for wpa supplicant for common/ivi Group: Network & Connectivity/Wireless -Provides: wifi-direct-plugin-wpasupplicant-compat = %{version}-%{release} -Provides: wifi-direct-plugin-wpasupplicant-profile_ivi = %{version}-%{release} -Conflicts: wifi-direct-plugin-wpasupplicant-profile_wearable -Conflicts: wifi-direct-plugin-wpasupplicant-profile_mobile -Conflicts: wifi-direct-plugin-wpasupplicant-profile_tv +Requires: wifi-direct-plugin-wpasupplicant = %{version}-%{release} %description -n wifi-direct-plugin-wpasupplicant-profile_common Wi-Fi direct manager plugin to abstract wpa_supplicant for common/ivi %endif @@ -135,10 +129,7 @@ Wi-Fi direct manager plugin to abstract wpa_supplicant for common/ivi %package -n wifi-direct-plugin-wpasupplicant-profile_mobile Summary: Wifi direct plugin for wpa supplicant for mobile Group: Network & Connectivity/Wireless -Provides: wifi-direct-plugin-wpasupplicant-compat = %{version}-%{release} -Conflicts: wifi-direct-plugin-wpasupplicant-profile_wearable -Conflicts: wifi-direct-plugin-wpasupplicant-profile_common -Conflicts: wifi-direct-plugin-wpasupplicant-profile_tv +Requires: wifi-direct-plugin-wpasupplicant = %{version}-%{release} %description -n wifi-direct-plugin-wpasupplicant-profile_mobile Wi-Fi direct manager plugin to abstract wpa_supplicant for mobile @@ -146,7 +137,7 @@ Wi-Fi direct manager plugin to abstract wpa_supplicant for mobile %package -n wifi-direct-plugin-wpasupplicant-extension-TM1 Summary: Wifi direct plugin for wpa supplicant for mobile TM1 Group: Network & Connectivity/Wireless -Requires: wifi-direct-plugin-wpasupplicant-profile_mobile = %{version}-%{release} +Requires: wifi-direct-plugin-wpasupplicant-profile_mobile = %{version}-%{release} %description -n wifi-direct-plugin-wpasupplicant-extension-TM1 Wi-Fi direct manager plugin to abstract wpa_supplicant for mobile TM1 %endif @@ -158,10 +149,7 @@ Wi-Fi direct manager plugin to abstract wpa_supplicant for mobile TM1 %package -n wifi-direct-plugin-wpasupplicant-profile_wearable Summary: Wifi direct plugin for wpa supplicant for wearable Group: Network & Connectivity/Wireless -Provides: wifi-direct-plugin-wpasupplicant-compat = %{version}-%{release} -Conflicts: wifi-direct-plugin-wpasupplicant-profile_mobile -Conflicts: wifi-direct-plugin-wpasupplicant-profile_common -Conflicts: wifi-direct-plugin-wpasupplicant-profile_tv +Requires: wifi-direct-plugin-wpasupplicant = %{version}-%{release} %description -n wifi-direct-plugin-wpasupplicant-profile_wearable Wi-Fi direct manager plugin to abstract wpa_supplicant for wearable %endif @@ -172,10 +160,7 @@ Wi-Fi direct manager plugin to abstract wpa_supplicant for wearable %package -n wifi-direct-plugin-wpasupplicant-profile_tv Summary: Wifi direct plugin for wpa supplicant for tv Group: Network & Connectivity/Wireless -Provides: wifi-direct-plugin-wpasupplicant-compat = %{version}-%{release} -Conflicts: wifi-direct-plugin-wpasupplicant-profile_mobile -Conflicts: wifi-direct-plugin-wpasupplicant}-profile_wearable -Conflicts: wifi-direct-plugin-wpasupplicant-profile_common +Requires: wifi-direct-plugin-wpasupplicant = %{version}-%{release} %description -n wifi-direct-plugin-wpasupplicant-profile_tv Wi-Fi direct manager plugin to abstract wpa_supplicant for tv %endif @@ -491,7 +476,7 @@ esac %post -n wifi-direct-plugin-wpasupplicant-profile_mobile pushd %{_libdir} -mv wifi-direct-plugin-wpasupplicant.so.mobile wifi-direct-plugin-wpasupplicant.so +ln -sf wifi-direct-plugin-wpasupplicant.so.mobile wifi-direct-plugin-wpasupplicant.so popd /sbin/ldconfig @@ -512,7 +497,7 @@ esac %ifarch %{arm} %post extension-TM1 pushd %{_bindir} -ln -sf wfd-manager.tm1 wfd-manager.mobile +ln -sf wfd-manager.tm1 wfd-manager popd %preun extension-TM1 case "$1" in @@ -529,7 +514,7 @@ esac %post -n wifi-direct-plugin-wpasupplicant-extension-TM1 pushd %{_libdir} -mv wifi-direct-plugin-wpasupplicant.so.tm1 wifi-direct-plugin-wpasupplicant.so +ln -sf wifi-direct-plugin-wpasupplicant.so.tm1 wifi-direct-plugin-wpasupplicant.so popd /sbin/ldconfig @@ -538,7 +523,7 @@ case "$1" in 0) # This is an un-installation. pushd %{_libdir} - mv wifi-direct-plugin-wpasupplicant.so.mobile wifi-direct-plugin-wpasupplicant.so.tm1 + rm wifi-direct-plugin-wpasupplicant.so popd ;; 1)