Change HAL configuration path

Followings configurations are moved to HAL directory

/usr/share/pulseaudio/ to /hal/share/pulseaudio/
/etc/pulse/ to /hal/etc/pulse/

[Version] 13.0-30
[Issue Type] New HAL

Change-Id: I2aa68e3c18176058c68110689adff7d07648fd99

diff --git a/configure.ac b/configure.ac
index 3527873..020f549 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1387,7 +1387,7 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY, [Location of pactl binary])
 AC_SUBST(PA_SOEXT, [.so])
 AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension])
 
-AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"])
+AC_SUBST(pulseconfdir, ["${hal_sysconfdir}/pulse"])
 AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files])
 
 #### Mac OSX specific stuff #####
@@ -1814,6 +1814,7 @@ echo "
 
     prefix:                        ${prefix}
     sysconfdir:                    ${sysconfdir}
+    hal_sysconfdir:                ${hal_sysconfdir}
     localstatedir:                 ${localstatedir}
     modlibexecdir:                 ${modlibexecdir}
     System Runtime Path:           ${PA_SYSTEM_RUNTIME_PATH}

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index 41e1791..a70ed56 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -3,7 +3,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          13.0
-Release:          29
+Release:          30
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org
@@ -186,6 +186,7 @@ export CFLAGS+=" -DTIZEN_TV_PROD "
 export LD_AS_NEEDED=0
 NOCONFIGURE=yes ./bootstrap.sh
 %configure --prefix=%{_prefix} \
+        --datadir=%{_hal_datadir} \
         --disable-static \
         --enable-alsa \
         --disable-ipv6 \
@@ -222,6 +223,7 @@ NOCONFIGURE=yes ./bootstrap.sh
         --enable-prelink \
         --enable-lwipc \
 %endif
+        hal_sysconfdir=%{_hal_sysconfdir}
 
 %__make %{?_smp_mflags} V=0
 
@@ -244,7 +246,7 @@ mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants/
 ln -s  ../pulseaudio.service  %{buildroot}%{_unitdir}/multi-user.target.wants/pulseaudio.service
 %endif
 
-fdupes  %{buildroot}%{_datadir}
+fdupes  %{buildroot}%{_hal_datadir}
 fdupes  %{buildroot}%{_includedir}
 
 # get rid of *.la files
@@ -276,7 +278,6 @@ setcap -r /usr/bin/pulseaudio
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %license LICENSE LGPL
-%exclude %{_bindir}/esdcompat
 %{_bindir}/pulseaudio
 %{_libdir}/pulseaudio/libpulsecore-%{version}.so
 %{udev_dir}/rules.d/90-pulseaudio.rules
@@ -357,8 +358,8 @@ setcap -r /usr/bin/pulseaudio
 %else
 %{_unitdir}/multi-user.target.wants/pulseaudio.service
 %endif
-%exclude /usr/share/bash-completion/completions/*
-%exclude /usr/share/zsh/site-functions/_pulseaudio
+%exclude %{_hal_datadir}/bash-completion/completions/*
+%exclude %{_hal_datadir}/zsh/site-functions/_pulseaudio
 
 
 %files -n libpulse
@@ -380,7 +381,7 @@ setcap -r /usr/bin/pulseaudio
 %{_libdir}/libpulse-mainloop-glib.so
 %{_libdir}/pkgconfig/libpulse*.pc
 %{_libdir}/pkgconfig/pulsecore.pc
-%{_datadir}/vala/vapi/libpulse.vapi
+%{_hal_datadir}/vala/vapi/libpulse.vapi
 # cmake stuff
 %{_libdir}/cmake/PulseAudio/PulseAudioConfig.cmake
 %{_libdir}/cmake/PulseAudio/PulseAudioConfigVersion.cmake
@@ -442,18 +443,18 @@ setcap -r /usr/bin/pulseaudio
 %files config
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/pulse/daemon.conf
-%config(noreplace) %{_sysconfdir}/pulse/default.pa
-%config(noreplace) %{_sysconfdir}/pulse/client.conf
-%config(noreplace) %{_sysconfdir}/pulse/system.pa
+%config(noreplace) %{_hal_sysconfdir}/pulse/daemon.conf
+%config(noreplace) %{_hal_sysconfdir}/pulse/default.pa
+%config(noreplace) %{_hal_sysconfdir}/pulse/client.conf
+%config(noreplace) %{_hal_sysconfdir}/pulse/system.pa
 
-%{_datadir}/pulseaudio/alsa-mixer/paths/*
-%{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
+%{_hal_datadir}/pulseaudio/alsa-mixer/paths/*
+%{_hal_datadir}/pulseaudio/alsa-mixer/profile-sets/*
 
 %files vala-bindings
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_datadir}/vala/vapi/*
+%{_hal_datadir}/vala/vapi/*
 
 %files realtime-scheduling
 %defattr(-,root,root,-)