TINF-226: resolve conflict between pulseausio alsa configs and mmfw-sysconf-panda packagessubmit/2.0-panda/20130828.192557

2 files changed, 12 insertions, 38 deletions

diff --git a/packaging/pulseaudio.changes b/packaging/pulseaudio.changes
index 5de2b2cf..45f9c7bf 100644
--- a/packaging/pulseaudio.changes
+++ b/packaging/pulseaudio.changes
@@ -1,3 +1,6 @@
+* Wed Aug 28 18:43:01 UTC 2013 - tracy.graydon@intel.com
+- Fix the conflict between pulseaudio alsa config and mmfw-sysconf-panda 
+
 * Thu Aug 22 04:10:27 UTC 2013 - tracy.graydon@intel.com
 - Branch 2.0 to 2.0-panda for Panda IVI
 - Remove dependency on libatomic_ops. 
diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index da0b6b56..acc467b3 100644
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -3,7 +3,8 @@
 Name:       pulseaudio
 Summary:    Improved Linux sound server
 Version:    2.1
-Release:    0
+Release:    5.1
+VCS:        profile/ivi/pulseaudio#submit/2.0/20130415.125717-0-g87d28d4
 Group:      Multimedia/PulseAudio
 License:    LGPLv2+
 URL:        http://pulseaudio.org
@@ -22,7 +23,6 @@ BuildRequires:  pkgconfig(dbus-1)
 BuildRequires:  pkgconfig(xi)
 BuildRequires:  pkgconfig(libudev)
 BuildRequires:  pkgconfig(vconf)
-#BuildRequires:  libatomic_ops-devel
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  json-c-devel
 BuildRequires:  m4
@@ -91,23 +91,9 @@ License:        LGPLv2+
 Group:          Development/Libraries
 Requires:       %{name}-libs-devel = %{version}-%{release}
 
-%package config
-Summary: Default configuration for PulseAudio.
-Group: System Environment/Configuration
-
-%description config
-Default configuration for PulseAudio.
-
 %description module-devel
 Headers and libraries for developing pulseaudio modules
 
-#%package module-zeroconf
-#Summary: PA module-zeroconf
-#Group:   Multimedia/PulseAudio
-#
-#%description module-zeroconf
-#PA module-zeroconf.
-
 %package module-raop
 Summary: PA module-raop
 Group:   Multimedia/PulseAudio
@@ -208,6 +194,11 @@ mkdir -p %{buildroot}/%{_includedir}/pulsemodule/pulsecore
 
 cp %{buildroot}/%{_includedir}/pulse/*.h %{buildroot}/%{_includedir}/pulsemodule/pulse
 
+rm -f %{_datadir}/pulseaudio/alsa-mixer/paths/*
+rm -f %{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
+rm -f %{buildroot}/etc/pulse/*
+rm -rf %{buildroot}/usr/share/pulseaudio/*
+
 %find_lang pulseaudio
 fdupes  %{buildroot}/%{_datadir}
 fdupes  %{buildroot}/%{_includedir}
@@ -216,9 +207,6 @@ fdupes  %{buildroot}/%{_includedir}
 rm -f %{buildroot}/%{_libdir}/*.la
 rm -f %{buildroot}/%{_libdir}/pulseaudio/*.la
 
-# put the default configuration file in place
-install -m 644 src/default.pa %{buildroot}/%{_sysconfdir}/pulse
-
 %post
 /sbin/ldconfig
 ln -s  /etc/rc.d/init.d/pulseaudio.sh /etc/rc.d/rc3.d/S20pulseaudio
@@ -232,19 +220,15 @@ rm -f %{_sysconfdir}/rc.d/rc4.d/S20pulseaudio
 fi
 
 %post libs -p /sbin/ldconfig
-
 %postun libs -p /sbin/ldconfig
 
-
 %post module-bluetooth -p /sbin/ldconfig
 %postun module-bluetooth -p /sbin/ldconfig
 
-
 %docs_package
 
 %lang_package
 
-
 %files
 %defattr(-,root,root,-)
 %doc LICENSE GPL LGPL
@@ -256,8 +240,6 @@ fi
 %{_libdir}/libpulsecore-%{version}.so
 %{_libdir}/libpulse-mainloop-glib.so.*
 /lib/udev/rules.d/90-pulseaudio.rules
-%{_datadir}/pulseaudio/alsa-mixer/paths/*
-%{_datadir}/pulseaudio/alsa-mixer/profile-sets/*
 %{_bindir}/pamon
 /etc/dbus-1/system.d/pulseaudio-system.conf
 # cmake stuff
@@ -370,11 +352,6 @@ fi
 %{_libdir}/pulse-%{version}/modules/libbluetooth-sbc.so
 %{_libdir}/pulse-%{version}/modules/libbluetooth-util.so
 
-#%files module-zeroconf
-#%defattr(-,root,root,-)
-#%{_libdir}/pulse-%{version}/modules/libavahi-wrap.so
-#%{_libdir}/pulse-%{version}/modules/module-zeroconf*.so
-
 %files module-raop
 %defattr(-,root,root,-)
 %{_libdir}/pulse-%{version}/modules/libraop.so
@@ -404,14 +381,6 @@ fi
 %defattr(-,root,root,-)
 %{_libdir}/pulse-%{version}/modules/module-switch-on-connect.so
 
-%files config
-%defattr(-,root,root,-)
-%{_sysconfdir}/pulse/default.pa
-%{_sysconfdir}/pulse/client.conf
-%{_sysconfdir}/pulse/default.pa
-%{_sysconfdir}/pulse/system.pa
-%{_sysconfdir}/pulse/daemon.conf
-
 %files module-devel
 %defattr(-,root,root)
 %{_includedir}/pulsemodule/pulsecore/*.h
@@ -425,3 +394,5 @@ fi
 %files vala-bindings
 %defattr(-,root,root,-)
 %{_datadir}/vala/vapi/*
+
+%changelog