Merge branch 'tizen_2.2' into tizen

Conflicts:
	packaging/osp-uifw.spec

Change-Id: I12818775c4a286034a63bef20b5efabab281d1f4

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 027ae11..d34b261 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,11 +38,6 @@ INSTALL(DIRECTORY ${LIBRARY_OUTPUT_PATH}/ DESTINATION lib/osp
                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 "*"
-               PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ
-                                       GROUP_EXECUTE GROUP_READ
-                                       WORLD_EXECUTE WORLD_READ)
 
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/usr/share/osp/bitmaps DESTINATION ../usr/share/osp)
 INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/res/common/usr/share/osp/effects DESTINATION ../usr/share/osp)

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

diff --git a/packaging/osp-uifw.spec b/packaging/osp-uifw.spec
old mode 100644 (file)
new mode 100755 (executable)
index 49be89c..23d0c76
--- a/packaging/osp-uifw.spec
+++ b/packaging/osp-uifw.spec
@@ -1,139 +1,118 @@
-%define debug_package %{nil}
-%define __strip /bin/true
-
-Name:       osp-uifw
-Summary:    The UI Framework library of OSP
-Version:    1.2.2.1
-Release:    62
-Group:      TO_BE/FILLED_IN
-License:    TO BE FILLED IN
-Source0:    %{name}-%{version}.tar.gz
+Name:           osp-uifw
+Version:        1.2.2.1
+Release:        60
+License:        Apache-2.0 or Flora
+Summary:        The UI Framework library of OSP
+Group:          Graphics & UI Framework/Libraries
+Source0:        %{name}-%{version}.tar.gz
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(capi-appfw-application)
-BuildRequires:  pkgconfig(capi-system-info)
-BuildRequires:  pkgconfig(capi-system-device)
-BuildRequires:  pkgconfig(capi-system-runtime-info)
-BuildRequires:  pkgconfig(bundle)
+BuildRequires:  lua-devel
+BuildRequires:  osp-appfw-internal-devel
+BuildRequires:  osp-image-core-internal-devel
+BuildRequires:  tolua++
 BuildRequires:  pkgconfig(appcore-common)
 BuildRequires:  pkgconfig(appcore-efl)
-BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(appsvc)
+BuildRequires:  pkgconfig(bundle)
 BuildRequires:  pkgconfig(cairo)
+BuildRequires:  pkgconfig(capi-appfw-application)
+BuildRequires:  pkgconfig(capi-system-device)
+BuildRequires:  pkgconfig(capi-system-info)
+BuildRequires:  pkgconfig(capi-system-runtime-info)
 BuildRequires:  pkgconfig(chromium)
-BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(dlog)
+BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(edbus)
 BuildRequires:  pkgconfig(elementary)
-BuildRequires:  pkgconfig(evas)
-BuildRequires:  pkgconfig(ecore)
 BuildRequires:  pkgconfig(ethumb)
+BuildRequires:  pkgconfig(evas)
 BuildRequires:  pkgconfig(ewebkit2)
-BuildRequires:  pkgconfig(xdamage)
-BuildRequires:  pkgconfig(gles20)
-BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(feedback)
 BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(fribidi)
+BuildRequires:  pkgconfig(gles20)
 BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(harfbuzz)
 BuildRequires:  pkgconfig(icu-i18n)
 BuildRequires:  pkgconfig(libdri2)
 BuildRequires:  pkgconfig(libdrm)
-BuildRequires:  pkgconfig(libtbm)
+BuildRequires:  pkgconfig(libexif)
 BuildRequires:  pkgconfig(libpng)
+BuildRequires:  pkgconfig(libtbm)
+BuildRequires:  pkgconfig(libtiff-4)
 BuildRequires:  pkgconfig(libwbxml2)
 BuildRequires:  pkgconfig(osp-appfw)
-BuildRequires:  osp-appfw-internal-devel
 BuildRequires:  pkgconfig(osp-image-core)
-BuildRequires:  osp-image-core-internal-devel
 BuildRequires:  pkgconfig(pango)
 BuildRequires:  pkgconfig(pixman-1)
 BuildRequires:  pkgconfig(pkgmgr)
+BuildRequires:  pkgconfig(sensor)
 BuildRequires:  pkgconfig(tts)
-BuildRequires:         pkgconfig(utilX)
+BuildRequires:  pkgconfig(utilX)
+BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xfixes)
-BuildRequires:  pkgconfig(xv)
+BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(xtst)
+BuildRequires:  pkgconfig(xv)
 BuildRequires:  pkgconfig(vconf)
-BuildRequires:  libexif-devel
-BuildRequires:  liblua-devel
-BuildRequires:  libtiff-devel
-BuildRequires:  tolua++-devel
-BuildRequires:  pkgconfig(feedback)
 
 # runtime requires
-Requires: capi-appfw-application
-Requires: capi-system-info
-Requires: osp-appfw
-Requires: osp-image-core
-Provides:   libosp-uifw.so.1
-
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+Requires:       capi-appfw-application
+Requires:       capi-system-info
+Requires:       osp-appfw
+Requires:       osp-image-core
 
 %description
 The UI Framework library of OSP
 
 %package devel
-Summary:    The UI Framework library of OSP (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        The UI Framework library of OSP (Development)
+Requires:       %{name} = %{version}
 
 %description devel
 The UI Framework library of OSP (DEV)
 
 %package internal-devel
-Summary:    osp ui framework internel (Internal)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
+Summary:        OSP UI framework internel (Internal)
+Requires:       %{name} = %{version}
 
 %description internal-devel
 The UI Framework library of OSP (Internal-DEV)
 
-%package debug
-Summary:    The UI Framework library of OSP (Development)
-Group:      TO_BE/FILLED_IN
-Requires:   %{name} = %{version}-%{release}
-
-%description debug
-The UI Framework library of OSP (DEV)
-
 %prep
 %setup -q
 
-
 %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} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_X86_ -D_OSP_EMUL_" %cmake . -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=x86
 %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} -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=arm
+CXXFLAGS="$CXXFLAGS -D_OSP_DEBUG_ -D_SECURE_LOG -D_OSP_ARMEL_" %cmake .  -DOBS=1 -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DARCH=arm
 %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.APLv2  %{buildroot}/usr/share/license/%{name}
-cp %{_builddir}/%{name}-%{version}/LICENSE.Flora  %{buildroot}/usr/share/license/%{name}
 
 %make_install
 mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants
 install -m 0644 clipboard.service %{buildroot}%{_prefix}/lib/systemd/system/clipboard.service
 ln -s ../clipboard.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/clipboard.service
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-/usr/lib/systemd/system/clipboard.service
-/usr/lib/systemd/system/multi-user.target.wants/clipboard.service
 %manifest osp-uifw.manifest
-/etc/config/screen/sysinfo-screen.xml
-/etc/config/touch/sysinfo-touch.xml
-/usr/share/license/%{name}
-/usr/share/osp/bitmaps/*
-/usr/share/osp/effects/*
+%license LICENSE.APLv2 LICENSE.Flora
+%{_prefix}/lib/systemd/system/clipboard.service
+%{_prefix}/lib/systemd/system/multi-user.target.wants/clipboard.service
+%{_sysconfdir}/config/screen/sysinfo-screen.xml
+%{_sysconfdir}/config/touch/sysinfo-touch.xml
+%{_datadir}/osp/bitmaps/*
+%{_datadir}/osp/themes/*
+%{_datadir}/osp/effects/*
 %{_libdir}/osp/libosp-uifw.so*
 
 %files devel
@@ -144,7 +123,3 @@ ln -s ../clipboard.service %{buildroot}%{_prefix}/lib/systemd/system/multi-user.
 %{_includedir}/osp/app/*.h
 %{_includedir}/osp/graphics/*.h
 %{_includedir}/osp/ui/*.h
-
-%files debug
-%{_libdir}/osp/debug/*.so*
-

diff --git a/src/uifw/CMakeLists.txt b/src/uifw/CMakeLists.txt
old mode 100644 (file)
new mode 100755 (executable)
index 5cecd0f..49d8431
--- a/src/uifw/CMakeLists.txt
+++ b/src/uifw/CMakeLists.txt
@@ -111,13 +111,6 @@ SET_TARGET_PROPERTIES(${this_target}
                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}"
-)
 
 SET(PC_NAME ${this_target})
 SET(PC_REQUIRED ${pc_requires})