From 89bd89f95e57414a1039638e40d384315d253e86a90466a3f719eaa5b03cc253 Mon Sep 17 00:00:00 2001
From: OBS User buildservice-autocommit <null@suse.de>
Date: Sun, 5 Dec 2010 22:22:44 +0000
Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/pulseaudio
revision 68.0
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=a7c69e8ca2fc11094ce992c712ab3e0c
---
pulseaudio.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pulseaudio.spec b/pulseaudio.spec
index e792f77..8d5bcf3 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -1,5 +1,5 @@
#
-# spec file for package pulseaudio (Version 0.9.21)
+# spec file for package pulseaudio (Version 0.9.22)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
From bf295ece285209e7b1ebab4db9cd82e9d8870267e550954bc1ce8a5389de7a5d Mon Sep 17 00:00:00 2001
From: Scott Reeves <sreeves@suse.com>
Date: Sat, 22 Jan 2011 01:35:29 +0000
Subject: [PATCH 2/2] Accepting request 58979 from
home:sreeves1:branches:multimedia:libs
reviewed ok.
OBS-URL: https://build.opensuse.org/request/show/58979
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/pulseaudio?expand=0&rev=60
---
...-fix-incorrect-check-of-return-value.patch | 34 +++++++++++++++++++
pulseaudio.changes | 6 ++++
pulseaudio.spec | 5 ++-
3 files changed, 44 insertions(+), 1 deletion(-)
create mode 100644 bnc666350-fix-incorrect-check-of-return-value.patch
diff --git a/bnc666350-fix-incorrect-check-of-return-value.patch b/bnc666350-fix-incorrect-check-of-return-value.patch
new file mode 100644
index 0000000..0ffe147
--- /dev/null
+++ b/bnc666350-fix-incorrect-check-of-return-value.patch
@@ -0,0 +1,34 @@
+From 7475a180ff99f08db8e79be8841ef2ef322806eb Mon Sep 17 00:00:00 2001
+From: Scott Reeves <sreeves@novell.com>
+Date: Thu, 20 Jan 2011 16:41:21 -0700
+Subject: [PATCH] fix incorrect check of return value
+
+---
+ src/pulsecore/core-util.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/pulsecore/core-util.c b/src/pulsecore/core-util.c
+index a642553..b662a7e 100644
+--- a/src/pulsecore/core-util.c
++++ b/src/pulsecore/core-util.c
+@@ -680,7 +680,7 @@ int pa_make_realtime(int rtprio) {
+ }
+
+ for (p = rtprio-1; p >= 1; p--)
+- if (set_scheduler(p)) {
++ if (set_scheduler(p) >= 0) {
+ pa_log_info("Successfully enabled SCHED_RR scheduling for thread, with priority %i, which is lower than the requested %i.", p, rtprio);
+ return 0;
+ }
+@@ -750,7 +750,7 @@ int pa_raise_priority(int nice_level) {
+ }
+
+ for (n = nice_level+1; n < 0; n++)
+- if (set_nice(n) > 0) {
++ if (set_nice(n) >= 0) {
+ pa_log_info("Successfully acquired nice level %i, which is lower than the requested %i.", n, nice_level);
+ return 0;
+ }
+--
+1.6.0.2
+
diff --git a/pulseaudio.changes b/pulseaudio.changes
index 28fd096..744752a 100644
--- a/pulseaudio.changes
+++ b/pulseaudio.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Jan 22 01:05:20 UTC 2011 - sreeves@novell.com
+
+- Add bnc666350-fix-incorrect-check-of-return-value.patch
+- Fix ownership of /var/lib/gdm for bnc#638052
+
-------------------------------------------------------------------
Thu Nov 26 10:07:49 CET 2010 - dimstar@opensuse.org
diff --git a/pulseaudio.spec b/pulseaudio.spec
index 8d5bcf3..bfe19c3 100644
--- a/pulseaudio.spec
+++ b/pulseaudio.spec
@@ -30,6 +30,8 @@ Source1: default.pa-for-gdm
Source2: setup-pulseaudio
Source99: baselibs.conf
Patch0: disabled-start.diff
+# PATCH-FIX-UPSTREAM bnc666350-fix-incorrect-check-of-return-value.patch sreeves@novell.com -- fix to correctly report realtime status
+Patch1: bnc666350-fix-incorrect-check-of-return-value.patch
Url: http://pulseaudio.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: alsa-devel
@@ -243,6 +245,7 @@ This package contains GDM integration hooks for the PulseAudio sound server.
%prep
%setup -q -T -b0
%patch0
+%patch1 -p1
%build
autoreconf
@@ -495,7 +498,7 @@ groupadd -r pulse-access &>/dev/null || :
%files gdm-hooks
%defattr(-,root,root)
-%dir %{_localstatedir}/lib/gdm
+%attr(0750, gdm, gdm) %dir %{_localstatedir}/lib/gdm
%attr(0700, gdm, gdm) %dir %{_localstatedir}/lib/gdm/.pulse
%attr(0600, gdm, gdm) %{_localstatedir}/lib/gdm/.pulse/default.pa