Merge branch 'tizen_2.2' of ssh://review.tizendev.org:29418/apps/livebox/provider...

Conflicts:
	packaging/libprovider.spec

Change-Id: I8a611474c6a7044d6a63ff09dccebd80146c2623

diff --cc CMakeLists.txt
Simple merge

diff --cc packaging/libprovider.spec
index 242f9b8,0125f3d..18a884f
--- 1/packaging/libprovider.spec
--- 2/packaging/libprovider.spec
+++ b/packaging/libprovider.spec
@@@ -1,26 -1,24 +1,27 @@@
- Name:           libprovider
- Version:        0.9.6
- Release:        1
- License:        Flora
- Summary:        Livebox service provider
- Group:          Web Framework/Libraries
- Source0:        %{name}-%{version}.tar.gz
- Source1001:     libprovider.manifest
- BuildRequires:  cmake
- BuildRequires:  gettext-tools
- BuildRequires:  pkgconfig(com-core)
- BuildRequires:  pkgconfig(dlog)
- BuildRequires:  pkgconfig(dri2proto)
- BuildRequires:  pkgconfig(gio-2.0)
- BuildRequires:  pkgconfig(glib-2.0)
- BuildRequires:  pkgconfig(libdri2)
- BuildRequires:  pkgconfig(libdrm)
- BuildRequires:  pkgconfig(libtbm)
- BuildRequires:  pkgconfig(livebox-service)
- BuildRequires:  pkgconfig(x11)
- BuildRequires:  pkgconfig(xdamage)
- BuildRequires:  pkgconfig(xext)
- BuildRequires:  pkgconfig(xfixes)
 -Name: libprovider
 -Summary: Library for developing the livebox service provider.
 -Version: 0.9.12
 -Release: 1
 -Group: HomeTF/Livebox
 -License: Flora License
 -Source0: %{name}-%{version}.tar.gz
 -BuildRequires: cmake, gettext-tools, coreutils
++Name:         libprovider
++Version:      0.9.12
++Release:      1
++License:      Flora
++Summary:      Library for developing the livebox service provider
++Group:                HomeTF/Livebox
++Source0:      %{name}-%{version}.tar.gz
++Source1001:   %{name}.manifest
++BuildRequires: cmake
++BuildRequires: gettext-tools
++BuildRequires: coreutils
+ BuildRequires: pkgconfig(dlog)
+ BuildRequires: pkgconfig(glib-2.0)
+ BuildRequires: pkgconfig(gio-2.0)
+ BuildRequires: pkgconfig(com-core)
+ BuildRequires: pkgconfig(x11)
+ BuildRequires: pkgconfig(xext)
+ BuildRequires: pkgconfig(libdri2)
+ BuildRequires: pkgconfig(libdrm)
+ BuildRequires: pkgconfig(libtbm)
+ BuildRequires: pkgconfig(xfixes)
+ BuildRequires: pkgconfig(dri2proto)
+ BuildRequires: pkgconfig(xdamage)
+ BuildRequires: pkgconfig(livebox-service)
  
  %description
  Supporting the commnuncation channel with master service for livebox remote view.
@@@ -36,27 -35,31 +37,33 @@@ Livebox data provider development libra
  
  %prep
  %setup -q
 +cp %{SOURCE1001} .
  
  %build
+ %if 0%{?tizen_build_binary_release_type_eng}
+ export CFLAGS="${CFLAGS} -DTIZEN_ENGINEER_MODE"
+ export CXXFLAGS="${CXXFLAGS} -DTIZEN_ENGINEER_MODE"
+ export FFLAGS="${FFLAGS} -DTIZEN_ENGINEER_MODE"
+ %endif
+ 
  %cmake .
 -make %{?jobs:-j%jobs}
 +make %{?_smp_mflags}
  
  %install
 -rm -rf %{buildroot}
  %make_install
 -mkdir -p %{buildroot}/%{_datarootdir}/license
  
 -%post
 +%post -p /sbin/ldconfig
 +
 +%postun -p /sbin/ldconfig
  
  %files -n libprovider
 -%manifest libprovider.manifest
 +%license LICENSE
  %defattr(-,root,root,-)
 +%manifest %{name}.manifest
  %{_libdir}/*.so*
 -%{_datarootdir}/license/*
  
  %files devel
 +%manifest %{name}.manifest
  %defattr(-,root,root,-)
  %{_includedir}/provider/provider.h
  %{_includedir}/provider/provider_buffer.h