From 1b9869447401fcbac6dc7256e5e0e25df2c4cf65 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Tue, 4 Apr 2017 11:28:05 +0900 Subject: [PATCH] Remove unused info file and macro Change-Id: Idbb72d483a6b37496414ccd4ad41653eca8b00e2 --- AUTHORS | 1 - CMakeLists.txt | 4 ---- LICENSE.APLv2.0 => LICENSE | 0 packaging/capi-network-http.spec | 28 ++++------------------------ sysinfo-http.xml | 6 ------ 5 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 AUTHORS rename LICENSE.APLv2.0 => LICENSE (100%) delete mode 100644 sysinfo-http.xml diff --git a/AUTHORS b/AUTHORS deleted file mode 100644 index 8b13789..0000000 --- a/AUTHORS +++ /dev/null @@ -1 +0,0 @@ - diff --git a/CMakeLists.txt b/CMakeLists.txt index a97e070..29579bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,10 +63,6 @@ CONFIGURE_FILE( @ONLY ) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) -MESSAGE("Arch ${ARCH}") -IF(NOT "${ARCH}" STREQUAL "emul") - INSTALL(FILES "${CMAKE_CURRENT_SOURCE_DIR}/sysinfo-http.xml" DESTINATION "/etc/config/connectivity") -ENDIF(NOT "${ARCH}" STREQUAL "emul") ADD_SUBDIRECTORY(test) diff --git a/LICENSE.APLv2.0 b/LICENSE similarity index 100% rename from LICENSE.APLv2.0 rename to LICENSE diff --git a/packaging/capi-network-http.spec b/packaging/capi-network-http.spec index 0b49860..d9c35e3 100644 --- a/packaging/capi-network-http.spec +++ b/packaging/capi-network-http.spec @@ -1,6 +1,6 @@ Name: capi-network-http Summary: Http Framework -Version: 0.0.20 +Version: 0.0.21 Release: 0 Group: System/Network License: Apache-2.0 @@ -35,18 +35,7 @@ export CFLAGS="$CFLAGS -DTIZEN_DEBUG_ENABLE" export CXXFLAGS="$CXXFLAGS -DTIZEN_DEBUG_ENABLE" export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" -%cmake -DCMAKE_BUILD_TYPE="Private" \ -%ifarch %{arm} - -DCMAKE_BUILD_TYPE="Private" -DARCH=arm \ -%else -%if 0%{?simulator} - -DCMAKE_BUILD_TYPE="Private" -DARCH=emul \ -%else - -DCMAKE_BUILD_TYPE="Private" -DARCH=i586 \ -%endif -%endif - . - +%cmake . make %{?_smp_mflags} @@ -62,20 +51,11 @@ make %{?_smp_mflags} %defattr(-,root,root,-) %{_libdir}/*.so.* %{_bindir}/http_test -%license LICENSE.APLv2.0 -%ifarch %{arm} -/etc/config/connectivity/sysinfo-http.xml -%else -%if 0%{?simulator} -# Noop -%else -/etc/config/connectivity/sysinfo-http.xml -%endif -%endif +%license LICENSE %files devel %defattr(-,root,root,-) %{_includedir}/network/*.h %{_libdir}/pkgconfig/*.pc %{_libdir}/*.so -%license LICENSE.APLv2.0 +%license LICENSE diff --git a/sysinfo-http.xml b/sysinfo-http.xml deleted file mode 100644 index 4e5f815..0000000 --- a/sysinfo-http.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - -- 2.7.4