Merge branch 'upstream' into tizen_base

Change-Id: I0f08009e1d47097b86033fcb7a37e7b44c006c94

diff --cc alsactl/alsa-restore.service.in
index 688353f,80fd5fd..3c7ffa6
--- 1/alsactl/alsa-restore.service.in
--- 2/alsactl/alsa-restore.service.in
+++ b/alsactl/alsa-restore.service.in
@@@ -13,6 -10,6 +10,7 @@@ ConditionPathExistsGlob=/dev/snd/contro
  
  [Service]
  Type=oneshot
 +SmackProcessLabel=System
+ RemainAfterExit=true
  ExecStart=-@sbindir@/alsactl restore
- StandardOutput=syslog
+ ExecStop=-@sbindir@/alsactl store

diff --cc alsactl/alsa-state.service.in
index e18486e,5a8fe5e..bc528e8
--- 1/alsactl/alsa-state.service.in
--- 2/alsactl/alsa-state.service.in
+++ b/alsactl/alsa-state.service.in
@@@ -6,12 -6,8 +6,8 @@@
  [Unit]
  Description=Manage Sound Card State (restore and store)
  ConditionPathExists=@daemonswitch@
- DefaultDependencies=no
- After=sysinit.target
- Before=shutdown.target
- Conflicts=shutdown.target
  
  [Service]
 -Type=simple
 +SmackProcessLabel=System
  ExecStart=-@sbindir@/alsactl -s -n 19 -c rdaemon
  ExecStop=-@sbindir@/alsactl -s kill save_and_quit

diff --cc packaging/alsa-utils.spec
index 5067521,0000000..06671dc
mode 100644,000000..100644
--- 1/packaging/alsa-utils.spec
--- /dev/null
+++ b/packaging/alsa-utils.spec
@@@ -1,60 -1,0 +1,60 @@@
- Version:        1.0.29
 +Name:           alsa-utils
++Version:        1.2.12
 +Release:        1
 +License:        GPL-2.0
 +Summary:        Advanced Linux Sound Architecture (ALSA) utilities
 +Url:            http://www.alsa-project.org/
 +Group:          Applications/Multimedia
 +Source0:        ftp://ftp.alsa-project.org/pub/utils/%{name}-%{version}.tar.bz2
 +Source1001:     alsa-utils.manifest
 +BuildRequires:  libasound-devel
 +
 +%description
 +This package contains command line utilities for the Advanced Linux Sound
 +Architecture (ALSA).
 +
 +%package doc
 +Summary:        Man pages for alsa-utils
 +Group:          Documentation
 +Requires:       %{name} = %{version}
 +
 +%description doc
 +Man pages for alsa-utils
 +
 +%prep
 +%setup -q
 +cp %{SOURCE1001} .
 +
 +
 +%build
 +export CFLAGS+=" -fPIC -pie"
 +
 +%configure \
 +    --disable-static \
 +    --disable-nls \
 +    --disable-xmlto \
 +    --disable-alsamixer \
 +    --disable-alsatest \
 +    --with-udev-rules-dir=/lib/udev/rules.d
 +
 +%__make %{?_smp_mflags}
 +
 +%install
 +%make_install
 +mkdir -p %{buildroot}/var/lib/alsa
 +%if "%{tizen_profile_name}" == "tv"
 +rm -rf %{buildroot}%{_bindir}/speaker-test
 +%endif
 +
 +%remove_docs
 +
 +%files
 +%manifest %{name}.manifest
 +%license COPYING
 +%{_bindir}/*
 +%{_sbindir}/*
 +%exclude %{_sbindir}/alsaconf
 +%exclude %{_sbindir}/alsa-info.sh
 +%{_datadir}/alsa/*
 +%{_datadir}/sounds/*
 +/lib/udev/rules.d/90-alsa-restore.rules