rpms/openoffice.org/devel openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch, NONE, 1.1 openoffice.org.spec, 1.1436, 1.1437 openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27592

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch 
Removed Files:
	openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch 
Log Message:
add some cups debugging stuff

openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch:

--- NEW FILE openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch ---
--- openoffice.org.orig/psprint/source/printer/cupsmgr.cxx	2008-02-26 09:00:02.000000000 +0000
+++ openoffice.org/psprint/source/printer/cupsmgr.cxx	2008-02-26 09:01:33.000000000 +0000
@@ -891,8 +891,10 @@
         it->second.getStr(),
         OUStringToOString( rJobTitle, aEnc ).getStr(),
         nNumOptions, pOptions );
-#if OSL_DEBUG_LEVEL > 1
-        fprintf( stderr, "cupsPrintFile( %s, %s, %s, %d, %p ) returns %d\n",
+        static const char* pEnv = getenv( "SAL_DEBUG_CUPS" );
+        if( ! pEnv || ! *pEnv )
+        {
+            fprintf( stderr, "cupsPrintFile( %s, %s, %s, %d, %p ) returns %d\n",
                     pDest->name,
                     it->second.getStr(),
                     OUStringToOString( rJobTitle, aEnc ).getStr(),
@@ -900,13 +902,13 @@
                     pOptions,
                     nJobID
                     );
-        for( int n = 0; n < nNumOptions; n++ )
-            fprintf( stderr, "    option %s=%s\n", pOptions[n].name, pOptions[n].value );
-        OString aCmd( "cp " );
-        aCmd = aCmd + it->second;
-        aCmd = aCmd + OString( " $HOME/cupsprint.ps" );
-        system( aCmd.getStr() );
-#endif
+            for( int n = 0; n < nNumOptions; n++ )
+                fprintf( stderr, "    option %s=%s\n", pOptions[n].name, pOptions[n].value );
+            OString aCmd( "cp " );
+            aCmd = aCmd + it->second;
+            aCmd = aCmd + OString( " $HOME/cupsprint.ps" );
+            system( aCmd.getStr() );
+        }
         
         unlink( it->second.getStr() );
         m_aSpoolFiles.erase( pFile );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1436
retrieving revision 1.1437
diff -u -r1.1436 -r1.1437
--- openoffice.org.spec	20 Feb 2008 12:35:01 -0000	1.1436
+++ openoffice.org.spec	26 Feb 2008 09:04:10 -0000	1.1437
@@ -144,6 +144,7 @@
 Patch70: openoffice.org-2.4.0.ooo86123.ucb.newneon.patch
 Patch71: openoffice.org-2.4.0.ooo86080.unopkg.bodge.patch
 Patch72: openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+Patch73: openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1101,6 +1102,7 @@
 %patch70 -p1 -b .ooo86123.ucb.newneon.patch
 %patch71 -p1 -b .ooo86080.unopkg.bodge.patch
 %patch72 -p1 -b .ooo86268.desktop.visibilitycockup.patch
+%patch73 -p1 -b .oooXXXXX.psprint.debugcups.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2878,6 +2880,8 @@
 %changelog
 * Wed Feb 20 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.4
 - add openoffice.org-2.4.0.ooo86268.desktop.visibilitycockup.patch
+- add openoffice.org-2.4.0.oooXXXXX.psprint.debugcups.patch to debug
+  rhbz#434803
 
 * Sun Feb 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-7.3
 - accidentally included scratch uno_packages cache, i.e. trashed your


--- openoffice.org-2.3.1.ooo84001.slideshow.gccisaprick.patch DELETED ---