Remove unused build macro

- The build macro for profiles has been not used since tizen 3.0.
- There are no source code for 'SUPPORT_KNOX'. Therefore 'SUPPORT_KNOX'
can be removed.

Change-Id: I699eea15bdce0d519d2a155bf96febebc24db4bc

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51092cc..8ad5b75 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,13 +52,6 @@ IF (TIZEN_2_3_UX)
        ADD_DEFINITIONS("-D_TIZEN_2_3_UX")
 ENDIF(TIZEN_2_3_UX)
 
-IF(DEFINED SUPPORT_KNOX)
-       MESSAGE("SUPPORT_KNOX: ${SUPPORT_KNOX}")
-       IF(SUPPORT_KNOX)
-               ADD_DEFINITIONS(-DSUPPORT_KNOX)
-       ENDIF(SUPPORT_KNOX)
-ENDIF(DEFINED SUPPORT_KNOX)
-
 ADD_DEFINITIONS(-DLIB_AGENT_PATH=\"${LIB_AGENT_PATH}\")
 
 # BUILD
@@ -94,7 +87,5 @@ ENDIF(TIZEN_2_3_UX)
 CONFIGURE_FILE(dump-download-provider.sh.in dump-download-provider.sh @ONLY)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/dump-download-provider.sh DESTINATION ${CMAKE_LOG_DUMP_SCRIPT_DIR})
 
-#IF(SUPPORT_KNOX)
-       MESSAGE("INSTALL download-provider.res")
-       INSTALL (FILES ${CMAKE_SOURCE_DIR}/download-provider.res DESTINATION /usr/share/download-provider)
-#ENDIF(SUPPORT_KNOX)
+MESSAGE("INSTALL download-provider.res")
+INSTALL (FILES ${CMAKE_SOURCE_DIR}/download-provider.res DESTINATION /usr/share/download-provider)

diff --git a/packaging/download-provider.spec b/packaging/download-provider.spec
index 0fc9baf..e96023c 100755 (executable)
--- a/packaging/download-provider.spec
+++ b/packaging/download-provider.spec
@@ -1,7 +1,6 @@
-%define _ux_define tizen2.3
 Name:       download-provider
 Summary:    Download the contents in background
-Version:    2.1.89
+Version:    2.1.90
 Release:    0
 Group:      Development/Libraries
 License:    Apache-2.0
@@ -28,20 +27,14 @@ BuildRequires:  pkgconfig(libsmack)
 BuildRequires:  gettext-devel
 BuildRequires:  pkgconfig(libsystemd-daemon)
 BuildRequires:  pkgconfig(capi-network-wifi-direct)
-#BuildRequires:  model-build-features T30
 BuildRequires:  pkgconfig(storage)
-%if "%{?tizen_profile_name}" == "wearable"
-BuildRequires:  pkgconfig(security-server)
-%else if "%{?tizen_profile_name}" == "mobile"
 BuildRequires:  pkgconfig(notification)
-%endif
-
-BuildRequires: pkgconfig(cynara-client)
-BuildRequires: pkgconfig(cynara-client-async)
-BuildRequires: pkgconfig(cynara-creds-socket)
-BuildRequires: pkgconfig(cynara-creds-dbus)
-BuildRequires: pkgconfig(tpkp-curl)
-BuildRequires: pkgconfig(libtzplatform-config)
+BuildRequires:  pkgconfig(cynara-client)
+BuildRequires:  pkgconfig(cynara-client-async)
+BuildRequires:  pkgconfig(cynara-creds-socket)
+BuildRequires:  pkgconfig(cynara-creds-dbus)
+BuildRequires:  pkgconfig(tpkp-curl)
+BuildRequires:  pkgconfig(libtzplatform-config)
 
 %description
 Description: Download the contents in background
@@ -67,32 +60,8 @@ Description: Download the contents in background (development files)
 %define _ipc_socket /tmp/.download-provider.sock
 %define _logdump_script_dir %{TZ_SYS_ETC}/dump.d/module.d
 %define _http_lib libcurl
-
-%define download_booster OFF
-%define support_oma_drm OFF
-%ifarch armv7l
-%define wifi_direct ON
-%else
-%define wifi_direct OFF
-%endif
-%define support_security_privilege OFF
-%define support_companion_mode OFF
-%define support_notification ON
-%define support_knox ON
 %define _manifest_name %{name}.manifest
 
-%if 0%{?model_build_feature_wlan_p2p_disable}
-%define wifi_direct OFF
-%endif
-%if "%{?tizen_profile_name}" == "wearable"
-%define download_booster OFF
-%define support_notification OFF
-%define _manifest_name %{name}-w.manifest
-%endif
-%if 0%{?sec_product_feature_container_enable}
-%define support_knox ON
-%endif
-
 %build
 export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE"
 export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE"
@@ -102,11 +71,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
        -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
        -DBIN_INSTALL_DIR:PATH=%{_bindir} \
        -DLIB_INSTALL_DIR:PATH=%{_libdir} \
-%ifarch aarch64 x86_64
-       -DLIB_AGENT_PATH="/usr/lib64/libdownloadagent2.so.0.1.0" \
-%else
-       -DLIB_AGENT_PATH="/usr/lib/libdownloadagent2.so.0.1.0" \
-%endif
+       -DLIB_AGENT_PATH="/usr/%{?_lib}/libdownloadagent2.so.0.1.0" \
        -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
        -DPKG_NAME=%{name} \
        -DPKG_VERSION=%{version} \
@@ -119,40 +84,13 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
        -DIMAGE_DIR:PATH=%{_imagedir} \
        -DLOCALE_DIR:PATH=%{_localedir} \
        -DSUPPORT_WIFI_DIRECT:BOOL=OFF \
-%if "%{?download_booster}" == "ON"
-       -DSUPPORT_DOWNLOAD_BOOSTER:BOOL=ON \
-%else \
        -DSUPPORT_DOWNLOAD_BOOSTER:BOOL=OFF \
-%endif
-%if "%{?support_notification}" == "ON"
        -DSUPPORT_NOTIFICATION:BOOL=ON \
-%else
-       -DSUPPORT_NOTIFICATION:BOOL=OFF \
-%endif
        -DSUPPORT_LOG_MESSAGE:BOOL=ON \
-%if "%{?support_oma_drm}" == "ON"
-       -DSUPPORT_OMA_DRM:BOOL=ON \
-%else
        -DSUPPORT_OMA_DRM:BOOL=OFF \
-%endif
-%if "%{?support_security_privilege}" == "ON"
-       -DSUPPORT_SECURITY_PRIVILEGE:BOOL=ON \
-%else \
        -DSUPPORT_SECURITY_PRIVILEGE:BOOL=OFF \
-%endif
-%if "%{?support_companion_mode}" == "ON"
-       -DSUPPORT_COMPANION_MODE:BOOL=ON \
-%else
        -DSUPPORT_COMPANION_MODE:BOOL=OFF \
-%endif
-%if "%{?support_knox}" == "ON"
-       -DSUPPORT_KNOX:BOOL=ON \
-%else
-       -DSUPPORT_KNOX:BOOL=OFF \
-%endif
-%if "%{?_ux_define}" == "tizen2.3"
        -DTIZEN_2_3_UX:BOOL=ON \
-%endif
        -DCMAKE_LOG_DUMP_SCRIPT_DIR=%{_logdump_script_dir} \
        -DHTTP_LIB=%{_http_lib} \
 %if "%{?_lib}" == "lib64"