ooo-build r13807 - branches/ooo-build-3-0/patches/dev300

[tml svn gnome org]

Author: tml
Date: Fri Sep  5 12:24:29 2008
New Revision: 13807
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13807&view=rev

Log:
Make it actually apply.


Modified:
   branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff

Modified: branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff
==============================================================================
--- branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff	(original)
+++ branches/ooo-build-3-0/patches/dev300/novell-win32-msi-patchability.diff	Fri Sep  5 12:24:29 2008
@@ -227,12 +227,13 @@
  multiasia = "{74543111-6ABF-4A12-AC11-D315E2939D2A}"
 --- solenv/bin/modules/installer/windows/file.pm
 +++ solenv/bin/modules/installer/windows/file.pm
-@@ -302,11 +302,46 @@
+@@ -302,12 +302,46 @@
  
  	if ( $allvariables->{'USE_FILEVERSION'} )
  	{
 -		if ( ! $allvariables->{'LIBRARYVERSION'} ) { installer::exiter::exit_program("ERROR: USE_FILEVERSION is set, but not LIBRARYVERSION", "get_fileversion"); } 
 -		$fileversion = $allvariables->{'LIBRARYVERSION'} . "\." . $installer::globals::buildid;
+-		if ( $onefile->{'FileVersion'} ) { $fileversion = $onefile->{'FileVersion'}; } # overriding FileVersion in scp
 +
 +		# Upstream uses LIBRARYVERSION appended with buildid
 +		# as the Version column values in the file