[4.0] Remove target_name Dependency 66/108166/7 accepted/tizen/common/20170208.155033 accepted/tizen/ivi/20170208.103905 accepted/tizen/mobile/20170208.103819 accepted/tizen/tv/20170208.103837 accepted/tizen/wearable/20170208.103849 submit/tizen/20170208.053959
authorhk57.kim <hk57.kim@samsung.com>
Fri, 3 Feb 2017 04:52:11 +0000 (13:52 +0900)
committerhk57.kim <hk57.kim@samsung.com>
Fri, 3 Feb 2017 06:49:01 +0000 (15:49 +0900)
 - This is for Tizen 4.0.
 - There are issue of having choice of .so files.
 - Remove target_name Dependency
 - We are going to unify repositories as well as build projects.
 - When you SR this, you need to create JIRA-TRE issue of:
   : add wifi-direct-manager-extension-TM1, wifi-direct-plugin-wpasupplicant-extension-TM1 for TM1 (mobile)

(It's add)
Change-Id: I0a767668b9a9a0bd200ee5eac3c573a4a955ca30
Signed-off-by: hk57.kim <hk57.kim@samsung.com>
packaging/wifi-direct-manager.spec

index 5d86763..06bf6db 100644 (file)
@@ -1,7 +1,7 @@
 # Do not provide .so automatically for the extensions.
 # This if statement is for backward compatibility with GBM/Obsolete build systems
 %if "%{?profile}" != "wearable" && "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common"
-%global __provides_exclude_from ^.*\\.(wearable|mobile|tv|ivi|common)$
+%global __provides_exclude_from ^.*\\.(wearable|mobile|tm1|tv|ivi|common)$
 %endif
 
 %define upgrade_script_path /usr/share/upgrade/scripts
@@ -69,6 +69,12 @@ Conflicts:   %{name}-profile_wearable
 Conflicts:     %{name}-profile_tv
 %description profile_mobile
 Manager for handling wifi-direct functionalities for mobile
+
+%package extension-TM1
+Summary:       Extension for mobile TM1
+Requires:      %{name}-profile_mobile = %{version}-%{release}
+%description extension-TM1
+Manager for handling wifi-direct functionalities for mobile TM1
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -133,6 +139,13 @@ Conflicts: wifi-direct-plugin-wpasupplicant-profile_common
 Conflicts:     wifi-direct-plugin-wpasupplicant-profile_tv
 %description -n wifi-direct-plugin-wpasupplicant-profile_mobile
 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}
+%description -n wifi-direct-plugin-wpasupplicant-extension-TM1
+Wi-Fi direct manager plugin to abstract wpa_supplicant for mobile TM1
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -213,9 +226,41 @@ cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
 %if ! 0%{?model_build_feature_network_tethering_disable}
        -DTIZEN_TETHERING_ENABLE=0 \
 %endif
-%if "%{?tizen_target_name}" == "TM1"
-       -DTIZEN_WLAN_BOARD_SPRD=1 \
+       -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
+       -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
+       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
+       -DTIZEN_FEATURE_WIFI_DISPLAY=1 \
+       -DTIZEN_FEATURE_DEFAULT_CONNECTION_AGENT=1 \
+       -DTIZEN_FEATURE_IP_OVER_EAPOL=1 \
+       -DCTRL_IFACE_DBUS=1 \
+       -DTIZEN_DEBUG_DBUS_VALUE=1 \
+       -DTIZEN_PROFILE_MOBILE=1 \
+       -DTIZEN_FEATURE_ASP=1 \
+%if "%{?_lib}" == "lib64"
+       -DTIZEN_ARCH_64=1 \
+%endif
+       -DLIB_DIR=%{_libdir} \
+       -DBIN_DIR=%{_bindir} \
+       -DSBIN_DIR=%{_sbindir} \
+       -DTZ_SYS_RO_ETC=%{TZ_SYS_RO_ETC} \
+       -DTZ_SYS_VAR=%{TZ_SYS_VAR} \
+       -DTZ_SYS_ETC=%{TZ_SYS_ETC} \
+       -DTZ_SYS_RUN=%{TZ_SYS_RUN}
+
+make %{?_smp_mflags}
+popd
+
+mkdir -p build_tm1
+pushd build_tm1
+cmake .. -DCMAKE_INSTALL_PREFIX=%{_prefix} -DARCHITECTURE=$ARCH \
+       -DTIZEN_ENABLE_PRD=0 \
+%if 0%{?model_build_feature_wlan_concurrent_mode}
+       -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
+%endif
+%if ! 0%{?model_build_feature_network_tethering_disable}
+       -DTIZEN_TETHERING_ENABLE=0 \
 %endif
+       -DTIZEN_WLAN_BOARD_SPRD=1 \
        -DTIZEN_FEATURE_WIFI_DIRECT_ON_DEMAND=1 \
        -DTIZEN_FEATURE_SERVICE_DISCOVERY=1 \
        -DTIZEN_WLAN_CONCURRENT_ENABLE=1 \
@@ -354,6 +399,11 @@ pushd build_mobile
 mv %{buildroot}%{_bindir}/wfd-manager %{buildroot}%{_bindir}/wfd-manager.mobile
 mv %{buildroot}%{_libdir}/wifi-direct-plugin-wpasupplicant.so %{buildroot}%{_libdir}/wifi-direct-plugin-wpasupplicant.so.mobile
 popd
+pushd build_tm1
+%make_install
+mv %{buildroot}%{_bindir}/wfd-manager %{buildroot}%{_bindir}/wfd-manager.tm1
+mv %{buildroot}%{_libdir}/wifi-direct-plugin-wpasupplicant.so %{buildroot}%{_libdir}/wifi-direct-plugin-wpasupplicant.so.tm1
+popd
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -418,7 +468,17 @@ pushd %{_bindir}
 ln -sf wfd-manager.mobile wfd-manager
 popd
 %preun profile_mobile
-rm %{_bindir}/wfd-manager
+case "$1" in
+  0)
+    # This is an un-installation.
+       rm %{_bindir}/wfd-manager
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
 
 %post -n wifi-direct-plugin-wpasupplicant-profile_mobile
 pushd %{_libdir}
@@ -427,9 +487,58 @@ popd
 /sbin/ldconfig
 
 %preun -n wifi-direct-plugin-wpasupplicant-profile_mobile
-rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
+case "$1" in
+  0)
+    # This is an un-installation.
+       rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
+       /sbin/ldconfig
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
+
+%post extension-TM1
+pushd %{_bindir}
+ln -sf wfd-manager.tm1 wfd-manager.mobile
+popd
+%preun extension-TM1
+case "$1" in
+  0)
+    # This is an un-installation.
+       rm %{_bindir}/wfd-manager
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
+
+%post -n wifi-direct-plugin-wpasupplicant-extension-TM1
+pushd %{_libdir}
+mv wifi-direct-plugin-wpasupplicant.so.tm1 wifi-direct-plugin-wpasupplicant.so.mobile
+popd
 /sbin/ldconfig
-%endif
+
+%preun -n wifi-direct-plugin-wpasupplicant-extension-TM1
+case "$1" in
+  0)
+    # This is an un-installation.
+       pushd %{_libdir}
+       mv wifi-direct-plugin-wpasupplicant.so.mobile wifi-direct-plugin-wpasupplicant.so.tm1
+       popd
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
+
+%endif //mobile
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if wearable || "undefined"
@@ -439,7 +548,17 @@ pushd %{_bindir}
 ln -sf wfd-manager.wearable wfd-manager
 popd
 %preun profile_wearable
-rm %{_bindir}/wfd-manager
+case "$1" in
+  0)
+    # This is an un-installation.
+       rm %{_bindir}/wfd-manager
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
 
 %post -n wifi-direct-plugin-wpasupplicant-profile_wearable
 pushd %{_libdir}
@@ -448,8 +567,18 @@ popd
 /sbin/ldconfig
 
 %preun -n wifi-direct-plugin-wpasupplicant-profile_wearable
-rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
-/sbin/ldconfig
+case "$1" in
+  0)
+    # This is an un-installation.
+       rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
+       /sbin/ldconfig
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -460,7 +589,17 @@ pushd %{_bindir}
 ln -sf wfd-manager.tv wfd-manager
 popd
 %preun profile_tv
-rm %{_bindir}/wfd-manager
+case "$1" in
+  0)
+    # This is an un-installation.
+       rm %{_bindir}/wfd-manager
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
 
 %post -n wifi-direct-plugin-wpasupplicant-profile_tv
 pushd %{_libdir}
@@ -469,8 +608,18 @@ popd
 /sbin/ldconfig
 
 %preun -n wifi-direct-plugin-wpasupplicant-profile_tv
-rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
-/sbin/ldconfig
+case "$1" in
+  0)
+    # This is an un-installation.
+       rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
+       /sbin/ldconfig
+  ;;
+  1)
+    # This is an upgrade.
+    # Do nothing.
+    :
+  ;;
+esac
 %endif
 
 %files
@@ -497,6 +646,12 @@ rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
 %files -n wifi-direct-plugin-wpasupplicant
 %manifest wifi-direct-plugin-wpasupplicant.manifest
 %license LICENSE
+# This is for backward-compatibility. This does not deteriorate 4.0 Configurability
+# if common || ivi || "undefined"
+%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "mobile"
+%defattr(-,root,root,-)
+%{_libdir}/wifi-direct-plugin-wpasupplicant.so
+%endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
 # if common || ivi || "undefined"
@@ -506,9 +661,7 @@ rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
 %{_bindir}/wfd-manager
 
 %files -n wifi-direct-plugin-wpasupplicant-profile_common
-%manifest wifi-direct-plugin-wpasupplicant.manifest
-%defattr(-,root,root,-)
-%{_libdir}/wifi-direct-plugin-wpasupplicant.so
+# default .so files are housed in the main pkg.
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability
@@ -522,6 +675,15 @@ rm %{_libdir}/wifi-direct-plugin-wpasupplicant.so
 %manifest wifi-direct-plugin-wpasupplicant.manifest
 %defattr(-,root,root,-)
 %{_libdir}/wifi-direct-plugin-wpasupplicant.so.mobile
+
+%files extension-TM1
+%defattr(-,root,root,-)
+%{_bindir}/wfd-manager.tm1
+
+%files -n wifi-direct-plugin-wpasupplicant-extension-TM1
+%manifest wifi-direct-plugin-wpasupplicant.manifest
+%defattr(-,root,root,-)
+%{_libdir}/wifi-direct-plugin-wpasupplicant.so.tm1
 %endif
 
 # This is for backward-compatibility. This does not deteriorate 4.0 Configurability