From 6ca69514c6bdd0e11cfd5c861938ec423c4c54be Mon Sep 17 00:00:00 2001
From: Jaroslav Kysela <perex@perex.cz>
Date: May 02 2012 15:23:54 +0000
Subject: Move ALSA modprobe.d configuration files from module-init-tools


---

diff --git a/alsa-lib.spec b/alsa-lib.spec
index 01b9552..fdd7d8c 100644
--- a/alsa-lib.spec
+++ b/alsa-lib.spec
@@ -5,11 +5,13 @@
 Summary: The Advanced Linux Sound Architecture (ALSA) library
 Name:    alsa-lib
 Version: 1.0.25
-Release: 3%{?prever_dot}%{?dist}
+Release: 4%{?prever_dot}%{?dist}
 License: LGPLv2+
 Group:   System Environment/Libraries
 Source:  ftp://ftp.alsa-project.org/pub/lib/%{name}-%{version}%{?prever}%{?postver}.tar.bz2
 Source10: asound.conf
+Source11: modprobe-dist-alsa.conf
+Source12: modprobe-dist-oss.conf
 Patch0:  alsa-lib-1.0.24-config.patch
 Patch2:  alsa-lib-1.0.14-glibc-open.patch
 Patch4:	 alsa-lib-1.0.16-no-dox-date.patch
@@ -66,6 +68,11 @@ ln -snf ../../%{_lib}/libasound.so.2 %{buildroot}%{_libdir}/libasound.so
 mkdir -p -m 755 %{buildroot}/etc
 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
+
 %clean
 rm -rf %{buildroot}
 
@@ -81,6 +88,7 @@ rm -rf %{buildroot}
 %{_bindir}/aserver
 %{_libdir}/alsa-lib/
 %{_datadir}/alsa/
+/lib/modprobe.d/dist-*
 
 %files devel
 %defattr(-,root,root,-)
@@ -93,6 +101,9 @@ rm -rf %{buildroot}
 %{_datadir}/aclocal/alsa.m4
 
 %changelog
+* Wed May  2 2012 Josh Boyer <jwboyer@redhat.com> - 1.0.25-4
+- Install ALSA related module conf files
+
 * Wed Feb  1 2012 Jaroslav Kysela <jkysela@redhat.com> - 1.0.25-3
 - Remove the pulse audio configuration from /etc/asound.conf
 
diff --git a/modprobe-dist-alsa.conf b/modprobe-dist-alsa.conf
new file mode 100644
index 0000000..cf31fa6
--- /dev/null
+++ b/modprobe-dist-alsa.conf
@@ -0,0 +1,9 @@
+# ALSA Sound Support
+#
+# We want to ensure that snd-seq is always loaded for those who want to use
+# the sequencer interface, but we can't do this automatically through udev
+# at the moment...so we have this rule (just for the moment).
+#
+# Remove the following line if you don't want the sequencer.
+
+install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-seq
diff --git a/modprobe-dist-oss.conf b/modprobe-dist-oss.conf
new file mode 100644
index 0000000..d432d7e
--- /dev/null
+++ b/modprobe-dist-oss.conf
@@ -0,0 +1,7 @@
+# OSS Sound Support
+# 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:
+#
+# install snd-pcm /sbin/modprobe --ignore-install snd-pcm && /sbin/modprobe snd-pcm-oss && /sbin/modprobe snd-seq-device && /sbin/modprobe snd-seq-oss