[alsa-lib/f19] resolve bug#926973

[perex]

commit 8cf967867cb74bbef8f0e93b7bec4f20bc3566a3
Author: Jaroslav Kysela <perex at perex.cz>
Date:   Thu Apr 11 15:49:05 2013 +0200

    resolve bug#926973

 alsa-lib.spec          |    6 ++++--
 modprobe-dist-oss.conf |    5 +++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/alsa-lib.spec b/alsa-lib.spec
index 26bd800..f78078c 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -73,7 +73,8 @@ install -p -m 644 %{SOURCE10} %{buildroot}/etc
 # Install the modprobe files for ALSA
 mkdir -p -m 755 %{buildroot}/lib/modprobe.d/
 install -p -m 644 %{SOURCE11} %{buildroot}/lib/modprobe.d/dist-alsa.conf
-install -p -m 644 %{SOURCE12} %{buildroot}/lib/modprobe.d/dist-oss.conf
+# bug#926973
+#install -p -m 644 %{SOURCE12} %{buildroot}/lib/modprobe.d/dist-oss.conf
 
 # Create UCM directory
 mkdir -p %{buildroot}/%{_datadir}/alsa/ucm
@@ -87,7 +88,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
 %files
 %defattr(-,root,root,-)
-%doc COPYING TODO doc/asoundrc.txt
+%doc COPYING TODO doc/asoundrc.txt ${SOURCE12}
 # file is as old as 0.2.0 / Red Hat bugzilla #510212
 #doc Changelog
 %config %{_sysconfdir}/asound.conf
@@ -109,6 +110,7 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
 %changelog
 * Thu Apr 11 2013 Jaroslav Kysela <perex at perex.cz> - 1.0.17-1
 - Updated to 1.0.27
+- move dist-oss.conf to doc as modprobe-dist-oss.conf
 
 * Wed Apr 03 2013 Stephen Gallagher <sgallagh at redhat.com> - 1.0.26-4
 - Add upstream patch to explicitly include sys/types.h
diff --git a/modprobe-dist-oss.conf b/modprobe-dist-oss.conf
index d432d7e..21f93cc 100644
--- a/modprobe-dist-oss.conf
+++ b/modprobe-dist-oss.conf
@@ -2,6 +2,7 @@
 # This has been disabled in F11 onwards because it can interfere with the
 # PulseAudio sound service (a legacy OSS application can prevent PulseAudio
 # applications from playing sound by preventing PulseAudio from (re-)opening
-# the sound device). To re-enable support, uncomment the following line:
+# the sound device). To re-enable support, copy this file to
+# the /etc/modprobe.d directory.
 #
-# install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss
+install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss