rpms/pulseaudio/devel pulseaudio-0.9.8-multilib.patch, 1.1, 1.2 pulseaudio.spec, 1.31, 1.32

[Lubomir Kundrak (lkundrak)]

Author: lkundrak

Update of /cvs/pkgs/rpms/pulseaudio/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26596

Modified Files:
	pulseaudio-0.9.8-multilib.patch pulseaudio.spec 
Log Message:
Fix multilib fix


pulseaudio-0.9.8-multilib.patch:

Index: pulseaudio-0.9.8-multilib.patch
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio-0.9.8-multilib.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pulseaudio-0.9.8-multilib.patch	29 Feb 2008 10:03:26 -0000	1.1
+++ pulseaudio-0.9.8-multilib.patch	29 Feb 2008 16:42:01 -0000	1.2
@@ -1,6 +1,13 @@
+Attempt to resolve the multilib conflicts by getting all the config files
+look equally for all plattforms.  This includes getting rid go pathnames
+with libdir; let's make ps search for files with relative paths there.
+
+https://bugzilla.redhat.com/show_bug.cgi?id=228383
+Lubomir Kundrak <lkundrak at redhat.com>
+
 diff -urp pulseaudio-0.9.8.orig/src/daemon/daemon.conf.in pulseaudio-0.9.8/src/daemon/daemon.conf.in
---- pulseaudio-0.9.8.orig/src/daemon/daemon.conf.in	2007-11-21 02:30:42.000000000 +0100
-+++ pulseaudio-0.9.8/src/daemon/daemon.conf.in	2008-02-29 09:04:27.000000000 +0100
+--- pulseaudio-0.9.8.orig/src/daemon/daemon.conf.in	2008-02-29 12:44:07.000000000 +0100
++++ pulseaudio-0.9.8/src/daemon/daemon.conf.in	2008-02-29 12:43:27.000000000 +0100
 @@ -38,7 +38,7 @@
  ; module-idle-time = 20
  ; scache-idle-time = 20
@@ -11,8 +18,8 @@
  ; default-script-file = @PA_DEFAULT_CONFIG_FILE@
  
 diff -urp pulseaudio-0.9.8.orig/src/daemon/default.pa.in pulseaudio-0.9.8/src/daemon/default.pa.in
---- pulseaudio-0.9.8.orig/src/daemon/default.pa.in	2008-02-29 06:40:07.000000000 +0100
-+++ pulseaudio-0.9.8/src/daemon/default.pa.in	2008-02-29 09:04:27.000000000 +0100
+--- pulseaudio-0.9.8.orig/src/daemon/default.pa.in	2008-02-29 12:44:07.000000000 +0100
++++ pulseaudio-0.9.8/src/daemon/default.pa.in	2008-02-29 12:43:27.000000000 +0100
 @@ -37,7 +37,7 @@ load-sample-lazy pulse-hotplug /usr/shar
  #load-module module-pipe-sink
  
@@ -41,8 +48,8 @@
  .endif
  
 diff -urp pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c pulseaudio-0.9.8/src/pulsecore/cli-command.c
---- pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c	2007-11-01 01:32:49.000000000 +0100
-+++ pulseaudio-0.9.8/src/pulsecore/cli-command.c	2008-02-29 09:04:27.000000000 +0100
+--- pulseaudio-0.9.8.orig/src/pulsecore/cli-command.c	2008-02-29 12:44:07.000000000 +0100
++++ pulseaudio-0.9.8/src/pulsecore/cli-command.c	2008-02-29 12:44:48.000000000 +0100
 @@ -31,6 +31,7 @@
  #include <stdlib.h>
  #include <errno.h>
@@ -51,7 +58,7 @@
  
  #include <pulse/xmalloc.h>
  
-@@ -1314,9 +1315,38 @@ int pa_cli_command_execute_line_stateful
+@@ -1314,9 +1315,39 @@ int pa_cli_command_execute_line_stateful
                      return -1;
                  } else {
                      const char *filename = cs+l+strspn(cs+l, whitespace);
@@ -75,9 +82,10 @@
 +                        char *pathname = malloc (strlen(path) + strlen(filename) + 2);
 +                        if (pathname == NULL)
 +                            return -1;
++                        pathname[0] = '\0';
 +
 +                        strcat(pathname, path);
-+                        strcat(pathname, '/'); /* XXX: Is this OK for Windows? */
++                        strcat(pathname, "/"); /* XXX: Is this OK for Windows? */
 +                        strcat(pathname, filename);
 +
 +                        *ifstate = access(pathname, F_OK) == 0 ? IFSTATE_TRUE : IFSTATE_FALSE;


Index: pulseaudio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pulseaudio/devel/pulseaudio.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- pulseaudio.spec	29 Feb 2008 10:03:26 -0000	1.31
+++ pulseaudio.spec	29 Feb 2008 16:42:01 -0000	1.32
@@ -394,7 +394,10 @@
 %{_mandir}/man1/pax11publish.1.gz
 
 %changelog
-* Fri Feb 29 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.9.8-8
+* Fri Feb 29 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.9.8-9
+- Fix the fix.
+
+* Fri Feb 29 2008 Lubomir Kundrak <lkundrak at redhat.com> 0.9.8-9
 - Fix multilib issue (#228383)
 - Prevent dumping core if exiting sooner that ltdl initializaion (#427962)