checked in

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=25

disabled-start.diff

@@ -1,15 +0,0 @@
---- src/daemon/start-pulseaudio-x11.in.sav	2009-06-08 00:35:57.000000000 +0200
-+++ src/daemon/start-pulseaudio-x11.in	2009-09-28 19:33:07.388014651 +0200
-@@ -19,6 +19,12 @@
- 
- set -e
- 
-+. /etc/sysconfig/sound
-+
-+if [ x"$PULSEAUDIO_ENABLE" = x"no" ] ; then
-+    exit 1
-+fi
-+
- [ -z "$PULSE_SERVER" ]
- 
- @PA_BINARY@ --start "$@"

pulseaudio-0.9.17.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7bc2f83419fde9ce81565409e107b42cd49e33d835d097d7c8a8019dc3037ef7
+size 1368593

pulseaudio-0.9.19.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d40a43b0736436fd76815dbbd12f97d93fbaee671744f839ae040d2b58531dc0
-size 1381146

pulseaudio.changes

@@ -1,21 +1,3 @@
--------------------------------------------------------------------
-Tue Oct  6 19:10:19 UTC 2009 - sreeves@novell.com
-
-- Update to 0.9.19
-    Bugfix update - see Changelog for full details
-
--------------------------------------------------------------------
-Mon Sep 28 17:36:58 UTC 2009 - llunak@novell.com
-
-- make 'setup-pulseaudio --disable' actually really disable PA (bnc#537780)
-
--------------------------------------------------------------------
-Thu Sep 24 16:43:16 UTC 2009 - sreeves@novell.com
-
-- Update to 0.9.18
-    Bugfix update - see Changelog for full details
-    Translation update.
-
 -------------------------------------------------------------------
 Fri Sep 18 22:05:47 UTC 2009 - sreeves@novell.com
 

pulseaudio.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package pulseaudio (Version 0.9.19)
+# spec file for package pulseaudio (Version 0.9.17)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -17,18 +17,17 @@
 
 # norootforbuild
 
-%define drvver 0.9.19
+%define drvver 0.9.17
 
 Name:           pulseaudio
 Summary:        A Networked Sound Server
-Version:        0.9.19
+Version:        0.9.17
 Release:        1
 License:        LGPL v2.1 or later
 Group:          System/Sound Daemons
 Source:         %{name}-%{version}.tar.bz2
 Source1:        default.pa-for-gdm
 Source2:        setup-pulseaudio
-Patch1:         disabled-start.diff
 Url:            http://pulseaudio.org
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  alsa-devel
@@ -238,7 +237,6 @@ This package contains GDM integration hooks for the PulseAudio sound server.
 %lang_package
 %prep
 %setup -q -T -b0
-%patch1
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
@@ -454,9 +452,6 @@ groupadd -r pulse-access &>/dev/null || :
 %{_libdir}/libpulse-simple.so
 %{_libdir}/libpulse-browse.so
 %{_libdir}/pkgconfig/libpulse*.pc
-%dir %{_datadir}/vala
-%dir %{_datadir}/vala/vapi
-%{_datadir}/vala/vapi/libpulse.vapi
 
 %files utils
 %defattr(-,root,root)

setup-pulseaudio

@@ -105,15 +105,6 @@ enable_xine() {
     echo ""
 }
 
-enable_autospawn() {
-    echo "Enabling PulseAudio autospawn..."
-    if grep -q ^autospawn /etc/pulse/client.conf; then
-	perl -pi -e "s|^autospawn.*|autospawn = yes|g;" /etc/pulse/client.conf
-    else
-	echo "autospawn = yes" >> /etc/pulse/client.conf
-    fi
-}
-
 disable_alsa() {
     echo "Disabling PulseAudio for ALSA..."
     perl -pi -e "s|ALSA_CONFIG_PATH=/etc/alsa-pulse.conf||g;" /etc/environment
@@ -164,15 +155,6 @@ disable_xine() {
     echo ""
 }
 
-disable_autospawn() {
-    echo "Disabling PulseAudio autospawn..."
-    if grep -q ^autospawn /etc/pulse/client.conf; then
-	perl -pi -e "s|^autospawn.*|autospawn = no|g;" /etc/pulse/client.conf
-    else
-	echo "autospawn = no" >> /etc/pulse/client.conf
-    fi
-}
-
 case $1 in
     --enable)
 	check_root || exit
@@ -185,7 +167,6 @@ case $1 in
 	enable_sdl
 	enable_timidity
 	enable_xine
-	enable_autospawn
 	;;
     --disable)
 	check_root || exit
@@ -198,7 +179,6 @@ case $1 in
 	disable_sdl
 	disable_timidity
 	disable_xine
-	disable_autospawn
 	;;
     --status)
 	STATUS=`grep PULSEAUDIO_ENABLE /etc/sysconfig/sound | cut -f2 -d= | cut -f2 -d\"`
@@ -215,7 +195,7 @@ case $1 in
 esac
 
 # Now, update /etc/sysconfig/sound with the PA status
-if grep -q PULSEAUDIO_ENABLE /etc/sysconfig/sound; then
+if grep PULSEAUDIO_ENABLE /etc/sysconfig/sound; then
     if [  "x$ENABLE" = "x1" ]; then
 	perl -pi -e "s|PULSEAUDIO_ENABLE=\"no\"|PULSEAUDIO_ENABLE=\"yes\"|g;" /etc/sysconfig/sound
     else