rpms/kde-settings/F-8 pulseaudio.sh, NONE, 1.1 kde-settings.spec, 1.14, 1.15

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15417

Modified Files:
	kde-settings.spec 
Added Files:
	pulseaudio.sh 
Log Message:
* Tue Oct 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-33.1
- -pulseaudio: new subpkg, to enable pulseaudio support



--- NEW FILE pulseaudio.sh ---
#!/bin/sh

if [ -x /usr/bin/pulseaudio ]; then
  /usr/bin/pulseaudio -D
fi


Index: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/F-8/kde-settings.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- kde-settings.spec	23 Oct 2007 20:19:56 -0000	1.14
+++ kde-settings.spec	23 Oct 2007 23:02:17 -0000	1.15
@@ -4,13 +4,14 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 3.5
-Release: %{rel}%{?dist}
+Release: %{rel}%{?dist}.1
 
 Group:   System Environment/Base
 License: Public Domain
 # This is a package which is specific to our distribution.  
 # Thus the source is only available from within this srpm.
 Source0: kde-settings-%{version}-%{rel}.tar.bz2
+Source1: pulseaudio.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
@@ -39,6 +40,18 @@
 %description kdm
 %{summary}.
 
+%package pulseaudio
+Summary: Enable pulseaudio support
+Group:   System Environment/Base
+Requires: %{name} = %{version}-%{release}
+Requires: alsa-plugins-pulseaudio
+Requires: pulseaudio
+# +pulseaudio-utils until http://bugzilla.redhat.com/349751 fixed
+Requires: pulseaudio-module-x11 pulseaudio-utils
+#Requires: xine-lib-extras
+%description pulseaudio
+%{summary}.
+
 
 %prep
 %setup -q -c -n %{name}
@@ -47,18 +60,21 @@
 # Intentionally left blank.  Nothing to see here.
 
 %install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
+rm -rf %{buildroot}
+mkdir -p %{buildroot}{%{_datadir}/config,%{_sysconfdir}/kde/kdm}
 
-tar cpf - etc/ usr/ | tar --directory $RPM_BUILD_ROOT -xvpf -
+tar cpf - etc/ usr/ | tar --directory %{buildroot} -xvpf -
 
 # kdebase/kdm symlink
-rm -rf   $RPM_BUILD_ROOT%{_datadir}/config/kdm
-ln -sf ../../../etc/kde/kdm $RPM_BUILD_ROOT%{_datadir}/config/kdm
+rm -rf   %{buildroot}%{_datadir}/config/kdm
+ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
+
+# pulseaudio (auto)start
+install -p -m755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/pulseaudio.sh
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %pre kdm
@@ -103,8 +119,15 @@
 # hack needed for older rpm's
 #exclude %{_sysconfdir}/X11/xdm/X*
 
+%files pulseaudio
+%defattr(-,root,root,-)
+%{_sysconfdir}/kde/env/*.sh
+
 
 %changelog
+* Tue Oct 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-33.1
+- -pulseaudio: new subpkg, to enable pulseaudio support
+
 * Tue Oct 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5-33
 - kdmrc: ColorScheme=FedoraInfinityKDM
 - ksplashrc: drop Theme=Echo (ie, revert to Default)