rpms/openoffice.org/devel openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch, 1.2, 1.3 openoffice.org.spec, 1.2211, 1.2212

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29363

Modified Files:
	openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch 
	openoffice.org.spec 
Log Message:
tweak allow missing

openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch:
 scriptitems.pm |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

Index: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch	10 Oct 2009 15:48:46 -0000	1.2
+++ openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch	8 May 2010 07:48:16 -0000	1.3
@@ -5,7 +5,25 @@ retrieving revision 1.17
 diff -u -p -r1.17 scriptitems.pm
 --- openoffice.org.orig/solenv/bin/modules/installer/scriptitems.pm	24 Feb 2005 16:21:15 -0000	1.17
 +++ openoffice.org/solenv/bin/modules/installer/scriptitems.pm	18 Mar 2005 22:39:42 -0000
-@@ -1378,8 +1378,7 @@
+@@ -1077,7 +1077,7 @@
+ 			}
+ 			else
+ 			{
+-				$infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
++				$infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
+ 			}
+ 
+ 			push( @installer::globals::logfileinfo, $infoline);
+@@ -1155,7 +1155,7 @@
+ 			}
+ 			else
+ 			{
+-				$infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
++				$infoline = "WARNING: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
+ 			}
+ 
+ 			push( @installer::globals::logfileinfo, $infoline);
+@@ -1374,8 +1374,7 @@
  					$infoline = "ERROR: Removing file $filename from file list.\n";
  					push( @installer::globals::logfileinfo, $infoline);
  
@@ -15,7 +33,7 @@ diff -u -p -r1.17 scriptitems.pm
  
  					next;	# removing this file from list, if sourcepath is empty
  				}
-@@ -1390,8 +1389,7 @@
+@@ -1386,8 +1385,7 @@
  						$infoline = "ERROR: Removing file $filename from file list.\n";
  						push( @installer::globals::logfileinfo, $infoline);
  


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2211
retrieving revision 1.2212
diff -u -p -r1.2211 -r1.2212
--- openoffice.org.spec	7 May 2010 08:05:14 -0000	1.2211
+++ openoffice.org.spec	8 May 2010 07:48:16 -0000	1.2212
@@ -1686,7 +1686,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch66 -p1 -b .workspace.sw33bf04.patch
 %patch67 -p1 -b .ooo93818.sw.postitprint.patch
 %patch68 -p1 -b .ooo111286.sw.ignore-null-hint.patch
-%patch69 -p1 -b .ooo111446.writerfilter.avoidcrash.patch
+%patch69 -p0 -b .ooo111446.writerfilter.avoidcrash.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`