Fix build error

Signed-off-by: Hyunwoo Kim <hwlove.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5734e7a..e26b723 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,24 +72,11 @@ SET_TARGET_PROPERTIES(${this_target}
        CLEAN_DIRECT_OUTPUT 1
        )
 
-ADD_CUSTOM_COMMAND(TARGET ${this_target}
-    POST_BUILD
-               COMMAND ${CMAKE_COMMAND} -E copy ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} 
-               COMMAND ${CMAKE_COMMAND} -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${FULLVER} ${LIBRARY_OUTPUT_PATH}/debug/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}.${MAJORVER}
-               COMMAND ${CMAKE_STRIP} --strip-unneeded ${LIBRARY_OUTPUT_PATH}/${CMAKE_SHARED_LIBRARY_PREFIX}${this_target}${CMAKE_SHARED_LIBRARY_SUFFIX}
-    COMMENT "strip ${this_target}"
-               )   
-
 INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp 
                                FILES_MATCHING PATTERN "*.so*" 
                                PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ                                          
                                                                                GROUP_EXECUTE GROUP_READ
                                                                                WORLD_EXECUTE WORLD_READ)
-INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/debug/ DESTINATION lib/osp/debug 
-                               FILES_MATCHING PATTERN "*.so*" 
-                               PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ                                          
-                                                                               GROUP_EXECUTE GROUP_READ
-                                                                               WORLD_EXECUTE WORLD_READ)
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/inc/ DESTINATION include/osp FILES_MATCHING PATTERN "*.h")
 

diff --git a/LICENSE.Apache-2.0 b/LICENSE.APLv2
similarity index 100%
rename from LICENSE.Apache-2.0
rename to LICENSE.APLv2

diff --git a/packaging/osp-secure-element.manifest b/packaging/osp-secure-element.manifest
new file mode 100644 (file)
index 0000000..75b0fa5
--- /dev/null
+++ b/packaging/osp-secure-element.manifest
@@ -0,0 +1,5 @@
+<manifest>
+    <request>
+        <domain name="_"/>
+    </request>
+</manifest>

diff --git a/packaging/secure-element.spec b/packaging/osp-secure-element.spec
similarity index 72%
rename from packaging/secure-element.spec
rename to packaging/osp-secure-element.spec
index 411d25d..b5ac04f 100644 (file)
--- a/packaging/secure-element.spec
+++ b/packaging/osp-secure-element.spec
@@ -1,13 +1,11 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
 Name:          osp-secure-element
 Summary:       The Secure Element library of OSP
 Version:       1.2.2.0
 Release:       1
 Group:         System/Libraries
-License:       LICENSE.Apache-2.0
+License:       Apache-2.0
 Source0:       %{name}-%{version}.tar.gz
+Source1001:            osp-secure-element.manifest
 BuildRequires:  cmake
 BuildRequires:  pkgconfig(osp-appfw)
 BuildRequires:  osp-appfw-internal-devel
@@ -18,34 +16,27 @@ BuildRequires:  pkgconfig(smartcard-service-common)
 Requires: osp-appfw
 
 %description
-osp secure element library
+The Secure Element library of OSP
 
 %package devel
-Summary:    osp secure element library (Development)
-Group:      TO_BE/FILLED_IN
+Summary:    The Secure Element library of OSP (Development)
+Group:      Development/Libraries
 Requires:   %{name} = %{version}-%{release}
 
 %description devel
-osp secure element library (DEV)
+The Secure Element library of OSP (DEV)
 
 %package internal-devel
-Summary:    osp secure element library (Internal)
+Summary:    The Secure Element library of OSP (Internal)
 Group:      TO_BE/FILLED_IN
 Requires:   %{name} = %{version}-%{release}
 
 %description internal-devel
-osp secure element library (Internal-DEV)
-
-%package debug
-Summary:    osp secure element library (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-osp secure element library (DEV)
+The Secure Element library of OSP (Internal-DEV)
 
 %prep
 %setup -q
+cp %{SOURCE1001} .
 
 %build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
@@ -60,12 +51,16 @@ CXXFLAGS="-O2 -g -pipe -Wall -Wformat -Wformat-security -Wl,--as-needed -fmessag
 %endif
 
 # Call make instruction with smp support
-make %{?jobs:-j%jobs}
+#make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
+
+%clean
+rm -rf %{buildroot}
 
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.Apache-2.0  %{buildroot}/usr/share/license/%{name}
+cp %{_builddir}/%{name}-%{version}/LICENSE.APLv2  %{buildroot}/usr/share/license/%{name}
 
 %make_install
 
@@ -81,6 +76,3 @@ cp %{_builddir}/%{name}-%{version}/LICENSE.Apache-2.0  %{buildroot}/usr/share/li
 %files devel
 %{_includedir}/osp/*.h
 %{_libdir}/pkgconfig/osp-secure-element.pc
-
-%files debug
-%{_libdir}/osp/debug/*.so*