ooo-build r11258 - in trunk: . patches/src680

[strba svn gnome org]

Author: strba
Date: Mon Jan 14 21:24:46 2008
New Revision: 11258
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11258&view=rev

Log:
fix packaging of glib2 for universal build

Added:
   trunk/patches/src680/setup_native-package-glib2.diff
Modified:
   trunk/ChangeLog
   trunk/patches/src680/apply

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Mon Jan 14 21:24:46 2008
@@ -1831,6 +1831,7 @@
 [ Glib2 ]
 external-package-glib2.diff
 scp2-package-glib2.diff
+setup_native-package-glib2.diff
 
 [ Gcc43 ]
 # Make it compile with gcc 4.3

Added: trunk/patches/src680/setup_native-package-glib2.diff
==============================================================================
--- (empty file)
+++ trunk/patches/src680/setup_native-package-glib2.diff	Mon Jan 14 21:24:46 2008
@@ -0,0 +1,26 @@
+diff -u -r setup_native.orig/source/packinfo/packinfo_office.txt setup_native/source/packinfo/packinfo_office.txt
+--- setup_native.orig/source/packinfo/packinfo_office.txt	2008-01-14 22:00:07.000000000 +0100
++++ setup_native/source/packinfo/packinfo_office.txt	2008-01-14 22:02:01.000000000 +0100
+@@ -17,6 +17,22 @@
+ # End
+ 
+ Start
++module = "gid_Module_Optional_Glib2"
++solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-glib2"
++solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01"
++packagename = "%UNIXPRODUCTNAME-glib2"
++linuxreplaces = "%WITHOUTDOTUNIXPRODUCTNAME-glib2"
++freebsdrequires = "%UNIXPRODUCTNAME-core01"
++requires = "%UNIXPRODUCTNAME-core01"
++conflicts = "glib2 >= 2.8.6"
++copyright = "1999-2006 by %PRODUCTNAME"
++solariscopyright = "solariscopyrightfile"
++vendor = "%PRODUCTNAME"
++description = "Optional glib2 libraries for %PRODUCTNAME %PRODUCTVERSION"
++destpath = "/opt/%UNIXPRODUCTNAME%PRODUCTVERSION"
++End
++
++Start
+ module = "gid_Module_Optional_Gnome"
+ solarispackagename = "%WITHOUTDOTUNIXPRODUCTNAME-gnome-integration"
+ solarisrequires = "%WITHOUTDOTUNIXPRODUCTNAME-core01, SUNWgnome-vfs, SUNWgnome-config"