From ea0c66ee0ebfd9b050c5ce00040ff8fdc9423ab9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 21 Dec 2010 16:24:04 +0000
Subject: [PATCH] fix to apply again

---
 ...g-3.1.0.oooXXXXX.solenv.allowmissing.patch | 70 +++++++++----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
index 1676e40..3ba2bd3 100644
--- a/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
+++ b/openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
@@ -5,52 +5,52 @@ 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
-@@ -1077,7 +1077,7 @@
- 			}
- 			else
- 			{
--				$infoline = "ERROR: Source for $$searchfilenameref not found!\n";	 # Important message in log file				
+@@ -1065,7 +1065,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				
+             push( @installer::globals::logfileinfo, $infoline);
+@@ -1143,7 +1143,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);
-@@ -1371,11 +1371,10 @@
+             push( @installer::globals::logfileinfo, $infoline);
+@@ -1360,11 +1360,10 @@
  
- 				if ( ! $installer::globals::languagepack )
- 				{
--					$infoline = "ERROR: Removing file $filename from file list.\n";
-+					$infoline = "WARNING: Removing file $filename from file list.\n";
- 					push( @installer::globals::logfileinfo, $infoline);
+                 if ( ! $installer::globals::languagepack && !$installer::globals::helppack)
+                 {
+-                    $infoline = "ERROR: Removing file $filename from file list.\n";
++                    $infoline = "WARNING: Removing file $filename from file list.\n";
+                     push( @installer::globals::logfileinfo, $infoline);
  
--					push(@missingfiles, "ERROR: File not found: $filename\n");	
--					$error_occured = 1;
-+					push(@missingfiles, "WARNING: File not found: $filename\n");	
+-                    push(@missingfiles, "ERROR: File not found: $filename\n");	
+-                    $error_occured = 1;
++                    push(@missingfiles, "WARNING: File not found: $filename\n");	
  
- 					next;	# removing this file from list, if sourcepath is empty
- 				}
-@@ -1383,11 +1382,10 @@
- 				{
- 					if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
- 					{
--						$infoline = "ERROR: Removing file $filename from file list.\n";
+                     next;	# removing this file from list, if sourcepath is empty
+                 }
+@@ -1372,11 +1371,10 @@
+                 {
+                     if (( $onefile->{'ismultilingual'} ) || ( $styles =~ /\bFORCELANGUAGEPACK\b/ ))
+                     {
+-                        $infoline = "ERROR: Removing file $filename from file list.\n";
 +						$infoline = "WARNING: Removing file $filename from file list.\n";
- 						push( @installer::globals::logfileinfo, $infoline);
+                         push( @installer::globals::logfileinfo, $infoline);
  
--						push(@missingfiles, "ERROR: File not found: $filename\n");	
--						$error_occured = 1;
+-                        push(@missingfiles, "ERROR: File not found: $filename\n");	
+-                        $error_occured = 1;
 +						push(@missingfiles, "WARNING: File not found: $filename\n");	
  
- 						next;	# removing this file from list, if sourcepath is empty		
- 					}
+                         next;	# removing this file from list, if sourcepath is empty		
+                     }
 --- openoffice.org.orig/solenv/bin/modules/installer/simplepackage.pm	2010-07-12 10:27:26.000000000 +0100
 +++ openoffice.org/solenv/bin/modules/installer/simplepackage.pm	2010-07-12 10:27:54.000000000 +0100
 @@ -53,7 +53,7 @@