Merge branch 'tizen_3.0' into tizen

Change-Id: Ie853e9a1a5f6f7ca752c1f0b98b0da926c7eb3a8

diff --combined packaging/mmfw-sysconf.spec
index 819b303,0919c4e..819b303
mode 100644,100755..100755
--- 1/packaging/mmfw-sysconf.spec
--- 2/packaging/mmfw-sysconf.spec
+++ b/packaging/mmfw-sysconf.spec
@@@ -1,7 -1,7 +1,7 @@@
  Name:       mmfw-sysconf
  Summary:    Multimedia Framework system configuration package
 -Version:    0.2.97
 -Release:    2
 +Version:    0.2.104
 +Release:    0
  Group:      Multimedia/Configuration
  License:    LGPL-2.1 and Apache-2.0
  Source0:    mmfw-sysconf-%{version}.tar.gz
@@@ -60,14 -60,6 +60,14 @@@ License: LGPL-2.1 and Apache-2.
  %description target-artik10
  Multimedia Framework system configuration package including ini, conf and etc files for artik 10 target.
  
 +%package target-tw2
 +Summary: Multimedia Framework system configuration package for tw2
 +Group: Multimedia/Configuration
 +License: LGPL-2.1 and Apache-2.0
 +
 +%description target-tw2
 +Multimedia Framework system configuration package including ini, conf and etc files for tw2 target.
 +
  
  %else
  
@@@ -114,10 -106,6 +114,10 @@@ cp -arf %{name}-target-tw1/* %{buildroo
  mkdir -p %{buildroot}%{_datadir}/%{name}-target-artik10
  cp -arf %{name}-target-artik10/* %{buildroot}%{_datadir}/%{name}-target-artik10
  
 +mkdir -p %{buildroot}%{_datadir}/%{name}-target-tw2%{_libdir}
 +cp -arf %{name}-target-tw2/* %{buildroot}%{_datadir}/%{name}-target-tw2
 +mv %{buildroot}%{_datadir}/%{name}-target-tw2/udev %{buildroot}%{_datadir}/%{name}-target-tw2%{_libdir}/udev
 +
  %else
  
  mkdir -p %{buildroot}%{_datadir}/%{name}-simulator
@@@ -152,10 -140,6 +152,10 @@@ rm -rf %{_datadir}/mmfw-sysconf-target-
  cp -arf %{_datadir}/mmfw-sysconf-target-artik10/* /
  rm -rf %{_datadir}/mmfw-sysconf-target-artik10
  
 +%post target-tw2
 +cp -arf %{_datadir}/mmfw-sysconf-target-tw2/* /
 +rm -rf %{_datadir}/mmfw-sysconf-target-tw2
 +
  %else
  
  %post simulator
@@@ -259,21 -243,6 +259,21 @@@ rm -rf %{_datadir}/mmfw-sysconf-simulat
  %{_datadir}/mmfw-sysconf-target-artik10%{_datadir}/pulseaudio/alsa-mixer/paths/*.common
  %{_datadir}/mmfw-sysconf-target-artik10%{_datadir}/pulseaudio/alsa-mixer/profile-sets/*.conf
  
 +%files target-tw2
 +%manifest mmfw-sysconf-target-tw2.manifest
 +%license LICENSE.APLv2.0 LICENSE.LGPLv2.1
 +%defattr(-,root,root,-)
 +%{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/asound.conf
 +%{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/pulse/*
 +%{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/murphy/*
 +%{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/profile.d/*
 +%{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/multimedia/*.ini
 +%{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/multimedia/*.conf
 +%{_datadir}/mmfw-sysconf-target-tw2%{_sysconfdir}/xdg/gstomx.conf
 +%{_datadir}/mmfw-sysconf-target-tw2%{_datadir}/pulseaudio/alsa-mixer/paths/*.conf
 +%{_datadir}/mmfw-sysconf-target-tw2%{_datadir}/pulseaudio/alsa-mixer/paths/*.common
 +%{_datadir}/mmfw-sysconf-target-tw2%{_datadir}/pulseaudio/alsa-mixer/profile-sets/*.conf
 +%{_datadir}/mmfw-sysconf-target-tw2%{_libdir}/udev/rules.d/*
  %else
  
  %files simulator