X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=packaging%2Fdali-toolkit.spec;h=00be5955692bfcdf44749ee8fe7eb08700c97b19;hb=bce55584aa00aff4946b88d2c578903efda2dda0;hp=31b970d7ce2beaf4bb7df1d911892e83bf8e20af;hpb=a61a6bb8ef8dc5aa1cff34fc5089a2f09d66a204;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 31b970d..00be595 100644
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,9 +1,9 @@
 Name:       dali-toolkit
 Summary:    The OpenGLES Canvas Core Library Toolkit
-Version:    1.2.36
+Version:    1.2.38
 Release:    1
 Group:      System/Libraries
-License:    Apache-2.0 and BSD-2-Clause and MIT
+License:    Apache-2.0 and BSD-3-Clause and MIT
 URL:        https://review.tizen.org/git/?p=platform/core/uifw/dali-toolkit.git;a=summary
 Source0:    %{name}-%{version}.tar.gz
 
@@ -34,12 +34,16 @@ BuildRequires:  pkgconfig(libtzplatform-config)
 %define profile %{tizen_profile_name}
 %endif
 
-# tv
-# %define dali_style_folder 1920x1080
-
-# common
+%if "%{profile}" == "mobile"
+%define dali_toolkit_profile MOBILE
 %define dali_style_folder 720x1280
 # dali_style to be provided by build system as with dali_toolkit_profile or by passing --define 'dali_style 470x800' to the rpm build command
+%endif
+
+%if "%{profile}" == "tv"
+%define dali_toolkit_profile TV
+%define dali_style_folder 1920x1080
+%endif
 
 %if "%{?dali_style}"
   %define dali_style_folder %{dali_style}
@@ -50,36 +54,6 @@ The OpenGLES Canvas Core Library Toolkit - a set of controls that provide
 user interface functionality.
 
 ##############################
-# resource
-##############################
-%package resources_480x800
-Summary:    default resource files for 480x800
-Requires:   %{name} = %{version}-%{release}
-Conflicts:  %{name}-resources_720x1280
-Conflicts:  %{name}-resources_1920x1080
-%description resources_480x800
-dali-toolkit default resource files for 480x800
-Contain po / sounds / common images / style / style images
-
-%package resources_720x1280
-Summary:    default resource files for 720x1280
-Requires:   %{name} = %{version}-%{release}
-Conflicts:  %{name}-resources_480x800
-Conflicts:  %{name}-resources_1920x1080
-%description resources_720x1280
-dali-toolkit default resource files for 720x1280
-Contain po / sounds / common images / style / style images
-
-%package resources_1920x1080
-Summary:    default resource files for 1920x1080
-Requires:   %{name} = %{version}-%{release}
-Conflicts:  %{name}-resources_480x800
-Conflicts:  %{name}-resources_720x1280
-%description resources_1920x1080
-dali-toolkit default resource files for 1920x1080
-Contain po / sounds / common images / style / style images
-
-##############################
 # devel
 ##############################
 %package devel
@@ -126,7 +100,7 @@ done
 ##############################
 %build
 PREFIX="/usr"
-CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections -D_GLIBCXX_USE_CXX11_ABI=0 "
+CXXFLAGS+=" -Wall -g -Os -fPIC -fvisibility-inlines-hidden -fdata-sections -ffunction-sections "
 LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed -Wl,--gc-sections -Wl,-Bsymbolic-functions "
 
 %if 0%{?enable_coverage}
@@ -140,7 +114,7 @@ autoreconf --install
 DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
 DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
 
-%configure --enable-profile=TIZEN \
+%configure --enable-profile=%{dali_toolkit_profile} \
            --with-style=%{dali_style_folder} \
 %if 0%{?enable_debug}
            --enable-debug \
@@ -154,9 +128,10 @@ make %{?jobs:-j%jobs}
 ##############################
 %install
 rm -rf %{buildroot}
-pushd build/tizen
+cd build/tizen
 %make_install DALI_DATA_RW_DIR="%{dali_data_rw_dir}" DALI_DATA_RO_DIR="%{dali_data_ro_dir}"
 
+
 # PO
 {
 cd %{_builddir}/dali-toolkit-%{version}/dali-toolkit/po
@@ -167,19 +142,6 @@ do
   cp ${language}.mo %{buildroot}/%{_datadir}/locale/${language}/LC_MESSAGES/dali-toolkit.mo
 done
 } &> /dev/null
-popd
-
-# Remove default style and style images which are for Linux build
-rm -rf %{buildroot}%{dali_toolkit_style_files}/*
-
-# Make folder to contain style and style images
-# After making folder, copy local style and style images to new folder
-mkdir -p %{buildroot}%{dali_toolkit_style_files}/480x800
-cp -r dali-toolkit/styles/480x800/* %{buildroot}%{dali_toolkit_style_files}/480x800
-mkdir -p %{buildroot}%{dali_toolkit_style_files}/720x1280
-cp -r dali-toolkit/styles/720x1280/* %{buildroot}%{dali_toolkit_style_files}/720x1280
-mkdir -p %{buildroot}%{dali_toolkit_style_files}/1920x1080
-cp -r dali-toolkit/styles/1920x1080/* %{buildroot}%{dali_toolkit_style_files}/1920x1080
 
 ##############################
 # Post Install
@@ -206,82 +168,13 @@ exit 0
 %endif
 %defattr(-,root,root,-)
 %{_libdir}/lib%{name}.so*
+%{dali_toolkit_image_files}/*
+%{dali_toolkit_sound_files}/*
+%{dali_toolkit_style_files}/*
 %license LICENSE
+%{_datadir}/locale/*/LC_MESSAGES/*
 
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/%{name}/*
 %{_libdir}/pkgconfig/*.pc
-
-%post resources_480x800
-pushd %{dali_toolkit_style_files}/480x800
-for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
-popd
-
-%preun resources_480x800
-pushd %{dali_toolkit_style_files}
-mv images ./480x800
-mv *.json ./480x800
-popd
-
-%postun resources_480x800
-pushd %{dali_toolkit_style_files}
-rm -rf 480x800
-popd
-
-%files resources_480x800
-%manifest dali-toolkit-resources.manifest
-%defattr(-,root,root,-)
-%{dali_toolkit_image_files}/*
-%{dali_toolkit_sound_files}/*
-%{dali_toolkit_style_files}/480x800/*
-%{_datadir}/locale/*/LC_MESSAGES/*
-
-%post resources_720x1280
-pushd %{dali_toolkit_style_files}/720x1280
-for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
-rm -rf ./*
-popd
-
-%preun resources_720x1280
-pushd %{dali_toolkit_style_files}
-mv images ./720x1280
-mv *.json ./720x1280
-popd
-
-%postun resources_720x1280
-pushd %{dali_toolkit_style_files}
-rm -rf 720x1280
-popd
-
-%files resources_720x1280
-%manifest dali-toolkit-resources.manifest
-%defattr(-,root,root,-)
-%{dali_toolkit_image_files}/*
-%{dali_toolkit_sound_files}/*
-%{dali_toolkit_style_files}/720x1280/*
-%{_datadir}/locale/*/LC_MESSAGES/*
-
-%post resources_1920x1080
-pushd %{dali_toolkit_style_files}/1920x1080
-for FILE in *; do mv ./"${FILE}" ../"${FILE}"; done
-popd
-
-%preun resources_1920x1080
-pushd %{dali_toolkit_style_files}
-mv images ./1920x1080
-mv *.json ./1920x1080
-popd
-
-%postun resources_1920x1080
-pushd %{dali_toolkit_style_files}
-rm -rf 1920x1080
-popd
-
-%files resources_1920x1080
-%manifest dali-toolkit-resources.manifest
-%defattr(-,root,root,-)
-%{dali_toolkit_image_files}/*
-%{dali_toolkit_sound_files}/*
-%{dali_toolkit_style_files}/1920x1080/*
-%{_datadir}/locale/*/LC_MESSAGES/*