Revert the config changessubmit/2.0-panda/20130829.234243

1 files changed, 38 insertions, 9 deletions

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index acc467b3..6334b0a4 100644
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -3,8 +3,7 @@
 Name:       pulseaudio
 Summary:    Improved Linux sound server
 Version:    2.1
-Release:    5.1
-VCS:        profile/ivi/pulseaudio#submit/2.0/20130415.125717-0-g87d28d4
+Release:    0
 Group:      Multimedia/PulseAudio
 License:    LGPLv2+
 URL:        http://pulseaudio.org
@@ -23,6 +22,7 @@ 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,9 +91,23 @@ 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
@@ -194,11 +208,6 @@ 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}
@@ -207,6 +216,9 @@ 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
@@ -220,15 +232,19 @@ 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
@@ -240,6 +256,8 @@ 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
@@ -352,6 +370,11 @@ 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
@@ -381,6 +404,14 @@ 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
@@ -394,5 +425,3 @@ fi
 %files vala-bindings
 %defattr(-,root,root,-)
 %{_datadir}/vala/vapi/*
-
-%changelog