ooo-build r12592 - trunk/patches/dev300

[strba svn gnome org]

Author: strba
Date: Mon May 19 14:57:44 2008
New Revision: 12592
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12592&view=rev

Log:
modify to the reality of dev300 packaging

Modified:
   trunk/patches/dev300/setup_native-package-glib2.diff

Modified: trunk/patches/dev300/setup_native-package-glib2.diff
==============================================================================
--- trunk/patches/dev300/setup_native-package-glib2.diff	(original)
+++ trunk/patches/dev300/setup_native-package-glib2.diff	Mon May 19 14:57:44 2008
@@ -6,21 +6,21 @@
  
  Start
 +module = "gid_Module_Optional_Glib2"
-+solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-glib2"
-+solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
-+packagename = "%UNIXPRODUCTNAME-glib2"
-+linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-glib2"
-+freebsdrequires = "%UNIXPRODUCTNAME-core01"
-+requires = "%UNIXPRODUCTNAME-core01"
++solarispackagename = "ooobasis%WITHOUTDOTOOOBASEVERSION-glib2"
++solarisrequires = "ooobasis%WITHOUTDOTOOOBASEVERSION-core01"
++packagename = "ooobasis%OOOBASEVERSION-glib2"
++freebsdrequires = "ooobasis%OOOBASEVERSION-core01"
++requires = "ooobasis%OOOBASEVERSION-core01"
 +conflicts = "glib2 >= 2.8.6"
-+copyright = "1999-2006 by %PRODUCTNAME"
++copyright = "1999-2007 by OpenOffice.org"
 +solariscopyright = "solariscopyrightfile"
-+vendor = "%PRODUCTNAME"
++vendor = "OpenOffice.org"
 +description = "Optional glib2 libraries for %PRODUCTNAME %PRODUCTVERSION"
-+destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++destpath = "/opt"
++packageversion = "%OOOPACKAGEVERSION"
 +End
 +
 +Start
  module = "gid_Module_Optional_Gnome"
- solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-gnome-integration"
- solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01, SUNWgnome-vfs, SUNWgnome-config"
+ solarispackagename = "ooobasis%WITHOUTDOTOOOBASEVERSION-gnome-integratn"
+ solarisrequires = "ooobasis%WITHOUTDOTOOOBASEVERSION-core01, SUNWgnome-vfs, SUNWgnome-config"