Merge branch 'tizen_2.2' into tizen

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
Change-Id: I4075a6502dea02266a6e63f786c1018c17b6802e

diff --git a/CMakeLists.txt b/CMakeLists.txt
old mode 100755 (executable)
new mode 100644 (file)
index 64bc1a1..e46ed16
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -57,29 +57,16 @@ TARGET_LINK_LIBRARIES(${this_target} "-L/usr/lib/osp -losp-appfw" )
 TARGET_LINK_LIBRARIES(${this_target} "-lsensor" )
 TARGET_LINK_LIBRARIES(${this_target} "-lcapi-system-sensor" )
 
-SET_TARGET_PROPERTIES(${this_target} 
-       PROPERTIES 
+SET_TARGET_PROPERTIES(${this_target}
+       PROPERTIES
        VERSION ${FULLVER}
        SOVERSION ${MAJORVER}
        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                                          
+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)
 

diff --git a/LICENSE.APLv2 b/LICENSE.APLv2
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/NOTICE b/NOTICE
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/osp-uix.pc.in b/osp-uix.pc.in
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/packaging/osp-uix.spec b/packaging/osp-uix.spec
old mode 100644 (file)
new mode 100755 (executable)
index 443c9fa..683c5bb
--- a/packaging/osp-uix.spec
+++ b/packaging/osp-uix.spec
@@ -1,67 +1,48 @@
-%define __strip /bin/true
-
-Name:          osp-uix
-Summary:       osp uix library
-Version:       1.2.2.0
-Release:       2
-Group:         System/Libraries
-License:       TO_BE/FILLED_IN
-Source0:       %{name}-%{version}.tar.gz
+Name:           osp-uix
+Version:        1.2.2.0
+Release:        2
+License:        Apache-2.0 or Flora
+Summary:        OSP uix library
+Group:          Graphics & UI Framework/Libraries
+Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(sensor)
+BuildRequires:  osp-appfw-internal-devel
 BuildRequires:  pkgconfig(capi-system-sensor)
 BuildRequires:  pkgconfig(osp-appfw)
-BuildRequires:  osp-appfw-internal-devel
+BuildRequires:  pkgconfig(sensor)
 
-# runtime requires
-Requires: osp-appfw 
+Requires:       osp-appfw
 
 %description
 osp uix library
 
 %package devel
-Summary:    osp uix library (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        OSP uix library (Development)
+Requires:       %{name} = %{version}
 
 %description devel
 osp uix library (DEV)
 
 %package internal-devel
-Summary:    osp uix library (Internal)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        OSP uix library (Internal)
+Requires:       %{name} = %{version}
 
 %description internal-devel
 osp uix library (Internal-DEV)
 
-%package debug
-Summary:    osp uix library (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-osp uix library (DEV)
-
 %prep
 %setup -q
 
-%build 
+%build
 MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
 %ifarch %{ix86}
-CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %else
-CXXFLAGS="-O2 -g -pipe -Wall -fno-exceptions -Wformat -Wformat-security -Wl,--as-needed -fmessage-length=0 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -D__SOFTFP__ -mthumb -Wa,-mimplicit-it=thumb -funwind-tables -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" %cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER}
 %endif
-
-# Call make instruction with smp support
-make %{?jobs:-j%jobs}
+make %{?_smp_mflags}
 
 %install
-rm -rf %{buildroot}
-mkdir -p %{buildroot}/usr/share/license
-cp %{_builddir}/%{name}-%{version}/LICENSE.Flora  %{buildroot}/usr/share/license/%{name}
-cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/license/%{name}
 %make_install
 
 %post -p /sbin/ldconfig
@@ -70,7 +51,7 @@ cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/lice
 
 %files
 %manifest osp-uix.manifest
-/usr/share/license/%{name}
+%license LICENSE.APLv2  LICENSE.Flora
 %{_libdir}/osp/*.so*
 
 %files devel
@@ -79,6 +60,3 @@ cat %{_builddir}/%{name}-%{version}/LICENSE.APLv2 >> %{buildroot}/usr/share/lice
 
 %files internal-devel
 %{_includedir}/osp/uix/*.h
-
-%files debug
-%{_libdir}/osp/debug/*.so*