From 19f1670fdb92335d343f15f5b04a29f2fd512205 Mon Sep 17 00:00:00 2001 From: Andreas Bierfert Date: Jan 03 2008 11:32:59 +0000 Subject: - fix #388971 --- diff --git a/fluxbox-startfluxbox-pulseaudio.patch b/fluxbox-startfluxbox-pulseaudio.patch new file mode 100644 index 0000000..2be652a --- /dev/null +++ b/fluxbox-startfluxbox-pulseaudio.patch @@ -0,0 +1,16 @@ +--- util/startfluxbox.in.orig 2008-01-03 12:01:31.000000000 +0100 ++++ util/startfluxbox.in 2008-01-03 12:07:30.000000000 +0100 +@@ -24,6 +24,13 @@ + shift + done + ++# start pulseaudio ++if [ -f /etc/fluxbox-pulseaudio ]; then ++ if [ -x /usr/bin/pulseaudio ]; then ++ /usr/bin/pulseaudio -D ++ fi ++fi ++ + if [ -x "$startup" ]; then + exec "$startup" + elif [ -r "$startup" ]; then diff --git a/fluxbox.spec b/fluxbox.spec index be465f1..e8929cb 100644 --- a/fluxbox.spec +++ b/fluxbox.spec @@ -1,6 +1,6 @@ Name: fluxbox Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window Manager based on Blackbox @@ -11,6 +11,7 @@ URL: http://fluxbox.sourceforge.net Source0: http://download.sourceforge.net/fluxbox/fluxbox-1.0.0.tar.bz2 Source3: fluxbox.desktop Source4: fluxbox-xdg-menu.py +Patch0: fluxbox-startfluxbox-pulseaudio.patch BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot BuildRequires: imlib2-devel @@ -38,9 +39,19 @@ what's the difference between fluxbox and blackbox then? The answer is: LOTS! Have a look at the homepage for more info ;) +%package pulseaudio +Group: User Interface/Desktops +Summary: Enable pulseaudio support +Requires: %{name} = %{version}-%{release} +Requires: alsa-plugins-pulseaudio +Requires: pulseaudio pulseaudio-module-x11 pulseaudio-utils + +%description pulseaudio +Enable pulseaudio support. %prep %setup -q +%patch0 %build %configure --enable-xft \ @@ -65,6 +76,10 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/xsessions/ install -m 0644 -p %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/xsessions/ install -m 0755 -p %SOURCE4 $RPM_BUILD_ROOT%{_bindir}/fluxbox-xdg-menu +# fix 388971 +mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir} +touch -r ChangeLog $RPM_BUILD_ROOT/%{_sysconfdir}/fluxbox-pulseaudio + %clean rm -rf $RPM_BUILD_ROOT @@ -76,7 +91,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name} %{_datadir}/xsessions/fluxbox.desktop +%files pulseaudio +%defattr(-,root,root,755) +%{_sysconfdir}/fluxbox-pulseaudio + %changelog +* Thu Jan 03 2008 Andreas Bierfert +1.0.0-2 +- add subpage -pulseaudio to fix #388971: fluxbox fails to start pulseaudio + at login + * Mon Oct 08 2007 Andreas Bierfert 1.0.0-1 - version upgrade