From 893d4ad1547f91e66c5c13bfe7d62482ab7818d6 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Wed, 5 Apr 2023 15:04:27 +0900 Subject: [PATCH] Remove wifi-direct dependency in the base rpm mobileap-agent.da is packed in the base rpm by 1fbacce12071db9d4909119566ae1dacad889221. It wasn't intentional. This patch makes mobileap-agent packed, not mobileap-agent.da. Change-Id: I14437336b3276292e7e6ecbff112126172379349 --- packaging/mobileap-agent.spec | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/packaging/mobileap-agent.spec b/packaging/mobileap-agent.spec index 759f72b..0cfcf96 100644 --- a/packaging/mobileap-agent.spec +++ b/packaging/mobileap-agent.spec @@ -1,6 +1,6 @@ Name: mobileap-agent Summary: Mobile AP daemon for setting tethering environments -Version: 1.0.144 +Version: 1.1.0 Release: 1 Group: System/Network License: Apache-2.0 @@ -104,6 +104,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" -DTIZEN_FEATURE_HEADLESS=0 \ -DTIZEN_FEATURE_MULTICAST=1 \ -DTIZEN_FEATURE_WLAN_BOARD_SPRD=0 \ + -DTIZEN_DA=0 \ -DBUILD_GTESTS=0 \ . @@ -120,6 +121,7 @@ make %{?jobs:-j%jobs} -DTIZEN_FEATURE_HEADLESS=0 \ -DTIZEN_FEATURE_MULTICAST=1 \ -DTIZEN_FEATURE_WLAN_BOARD_SPRD=1 \ + -DTIZEN_DA=0 \ -DBUILD_GTESTS=0 \ . @@ -136,6 +138,7 @@ make %{?jobs:-j%jobs} -DTIZEN_FEATURE_HEADLESS=0 \ -DTIZEN_FEATURE_MULTICAST=1 \ -DTIZEN_FEATURE_WLAN_BOARD_SPRD=1 \ + -DTIZEN_DA=0 \ -DBUILD_GTESTS=1 \ . @@ -145,18 +148,6 @@ rm %{buildroot}%{_bindir}/mobileap-agent make %{?jobs:-j%jobs} %endif -# Build for base rpm -%cmake -DCMAKE_BUILD_TYPE="BASE" \ - -DTIZEN_FEATURE_ENABLE_IPV6=0 \ - -DTIZEN_FEATURE_ENABLE_WIFI_DIRECT=0 \ - -DTIZEN_FEATURE_HEADLESS=1 \ - -DTIZEN_FEATURE_MULTICAST=1 \ - -DTIZEN_FEATURE_WLAN_BOARD_SPRD=0 \ - -DBUILD_GTESTS=0 \ - . - -make %{?jobs:-j%jobs} - # Build for DA %cmake -DCMAKE_BUILD_TYPE="DA" \ -DTIZEN_FEATURE_ENABLE_IPV6=1 \ @@ -173,6 +164,18 @@ mv %{buildroot}%{_bindir}/mobileap-agent %{_builddir}/%{name}-%{version}/mobilea make %{?jobs:-j%jobs} +# Build for base rpm +%cmake -DCMAKE_BUILD_TYPE="BASE" \ + -DTIZEN_FEATURE_ENABLE_IPV6=0 \ + -DTIZEN_FEATURE_ENABLE_WIFI_DIRECT=0 \ + -DTIZEN_FEATURE_HEADLESS=1 \ + -DTIZEN_FEATURE_MULTICAST=1 \ + -DTIZEN_FEATURE_WLAN_BOARD_SPRD=0 \ + -DTIZEN_DA=0 \ + -DBUILD_GTESTS=0 \ + . + +make %{?jobs:-j%jobs} %install %make_install -- 2.7.4