Merge spec files

Change-Id: I01cf2b7227d110eb9d6f174401d70ea909f912de
Signed-off-by: Hyunjee Kim <hj0426.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0822a804d67243fcb72c1a6a1f103e8f12a52913..1808f4bea40093b3df22da889c3dbbce4f4aca97 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ INCLUDE_DIRECTORIES(
        ${common_pkgs_INCLUDE_DIRS}
 )
 
-SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror")
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CFLAGS}")
 
@@ -22,3 +22,4 @@ SET(common_libs
 )
 
 ADD_SUBDIRECTORY(src/)
+ADD_SUBDIRECTORY(i18ninfo/)

diff --git a/i18ninfo/CMakeLists.txt b/i18ninfo/CMakeLists.txt
index 31f3c4d9a2962f3a72fbeb6cf091b04de6826fdb..6bf52915600ab4760bd3a752dd6f5dcb9120cdda 100644 (file)
--- a/i18ninfo/CMakeLists.txt
+++ b/i18ninfo/CMakeLists.txt
@@ -1,13 +1,8 @@
 PROJECT(i18ninfo C)
 
 SET(test_tool "i18ninfo")
-SET(dependents "capi-base-utils-i18n")
 
-INCLUDE(FindPkgConfig)
-pkg_check_modules(${test_tool} REQUIRED ${dependents})
-FOREACH(flag ${${test_tool}_CFLAGS})
-    SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-ENDFOREACH(flag)
+INCLUDE_DIRECTORIES("../src/include")
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -fPIE")
 SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -pie")
@@ -20,4 +15,4 @@ FOREACH(src ${sources})
     TARGET_LINK_LIBRARIES(${src_name} "base-utils-i18n" ${${test_tool}_LDFLAGS})
 ENDFOREACH()
 
-INSTALL(TARGETS i18ninfo DESTINATION ${BIN_INSTALL_DIR})
+INSTALL(TARGETS i18ninfo DESTINATION bin)

diff --git a/packaging/capi-base-utils.spec b/packaging/capi-base-utils.spec
index 628c03c61fd6bd4492e599a44e214d69a61bc565..776e9a01127b5c8189ae89968588986c3eb1b89c 100755 (executable)
--- a/packaging/capi-base-utils.spec
+++ b/packaging/capi-base-utils.spec
@@ -25,6 +25,16 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 The base utils library for internationalization and localization (Development)
 
+%package -n i18ninfo
+License:    Apache-2.0
+Summary:    The Base Utils Tool
+Version:    1.0.0
+Group:      Base
+Requires:      capi-base-utils-i18n
+
+%description -n i18ninfo
+The base utils library test tool
+
 %prep
 %setup -q
 
@@ -51,3 +61,8 @@ rm -rf %{buildroot}
 %defattr(-,root,root,-)
 %{_includedir}/base/utils_i18n*.h
 %{_libdir}/pkgconfig/*.pc
+
+%files -n i18ninfo
+%defattr(-,root,root,-)
+%{_bindir}/i18ninfo
+