From c1d85cd29d04b66627d6516a7a466aa024eef5ac Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 1 Apr 2009 15:03:38 +0000 Subject: [PATCH] Only load bt modules when installed --- ...-discover-module-only-when-installed.patch | 28 +++++++++++++++++++ pulseaudio.spec | 7 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-load-bt-discover-module-only-when-installed.patch diff --git a/0001-load-bt-discover-module-only-when-installed.patch b/0001-load-bt-discover-module-only-when-installed.patch new file mode 100644 index 0000000..af06f0d --- /dev/null +++ b/0001-load-bt-discover-module-only-when-installed.patch @@ -0,0 +1,28 @@ +From dcb24f5068f54f0fd3c30b691b8e3735973d008b Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 1 Apr 2009 16:15:27 +0200 +Subject: [PATCH] load bt discover module only when installed + +--- + src/daemon/default.pa.in | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/daemon/default.pa.in b/src/daemon/default.pa.in +index 57ccd9f..fa0683e 100755 +--- a/src/daemon/default.pa.in ++++ b/src/daemon/default.pa.in +@@ -58,9 +58,9 @@ load-module module-detect + .endif + + ### Automatically load driver modules for Bluetooth hardware +-#.ifexists module-bluetooth-discover@PA_SOEXT@ ++.ifexists module-bluetooth-discover@PA_SOEXT@ + load-module module-bluetooth-discover +-#.endif ++.endif + + ### Load several protocols + .ifexists module-esound-protocol-unix@PA_SOEXT@ +-- +1.6.2 + diff --git a/pulseaudio.spec b/pulseaudio.spec index fcdd7af..1858637 100644 --- a/pulseaudio.spec +++ b/pulseaudio.spec @@ -3,7 +3,7 @@ Name: pulseaudio Summary: Improved Linux sound server Version: 0.9.15 -Release: 7.test7%{?dist} +Release: 8.test7%{?dist} License: GPLv2+ Group: System Environment/Daemons Source0: http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-%{version}-test7.tar.gz @@ -49,6 +49,7 @@ Obsoletes: pulseaudio-devel Obsoletes: pulseaudio-core-libs Provides: pulseaudio-core-libs Requires: udev-extras +Patch0: 0001-load-bt-discover-module-only-when-installed.patch %description PulseAudio is a sound server for Linux and other Unix like operating @@ -186,6 +187,7 @@ This package contains command line utilities for the PulseAudio sound server. %prep %setup -q -T -b0 -n pulseaudio-0.9.15-test7 +%patch0 -p1 -b .load-bt-discover-module-only-when-installed %build CFLAGS="-ggdb" %configure --disable-static --disable-rpath --with-system-user=pulse --with-system-group=pulse --with-realtime-group=pulse-rt --with-access-group=pulse-access @@ -406,6 +408,9 @@ groupadd -r pulse-access &>/dev/null || : %{_mandir}/man1/pax11publish.1.gz %changelog +* Wed Apr 1 2009 Lennart Poettering 0.9.15-8.test7 +- Only load bt modules when installed + * Wed Apr 1 2009 Lennart Poettering 0.9.15-7.test7 - New test release