ooo-build r13531 - in trunk: . bin patches/dev300

[pmladek svn gnome org]

Author: pmladek
Date: Tue Aug 12 19:03:14 2008
New Revision: 13531
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13531&view=rev

Log:
2008-08-12  Petr Mladek  <pmladek suse cz>

	* patches/dev300/apply: temporary disable build-java-target-swext.diff,
	  build-java-target-codec-patch-with-crs.diff,
	  build-java-target-codec-patch-without-crs.diff: need to check if they
	  are still needed for SLED10

	* bin/package-ooo: remove scsolver.uno.oxt when doing RPM packaging;
	  will need to install it another way

	* bin/package-ooo: keep the mailmerge stuff in separate package

	* bin/install-mono: put cli_uno_bridge.dll.config into the filelist



Modified:
   trunk/ChangeLog
   trunk/bin/install-mono
   trunk/bin/package-ooo
   trunk/patches/dev300/apply

Modified: trunk/bin/install-mono
==============================================================================
--- trunk/bin/install-mono	(original)
+++ trunk/bin/install-mono	Tue Aug 12 19:03:14 2008
@@ -39,6 +39,10 @@
     sed -e "s|@LIBDIRBASE@|$LIBDIRBASE|g" \
 	-e "s|@OOOINSTALLDIRNAME@|$OOOINSTALLDIRNAME|g" \
 	$SRCDIR/$dll.config.in > $OOINSTDIR/ure/lib/$dll.config
+    if test -n "$OODESTDIR" ; then
+	file_list=`grep "^$OOINSTBASE/ure/lib/$dll$" $OODESTDIR/gid* | head -n 1 | cut -d: -f1`
+	echo "$OOINSTBASE/ure/lib/$dll.config" >>$file_list
+    fi
 done
 	perl -pi -e "s,</configuration>,  <dllmap dll=\"cli_uno_glue\" target=\"$LIBDIRBASE/$OOOINSTALLDIRNAME/basis-link/ure-link/lib/libcli_uno_glue.so\"/>\n</configuration>," \
 		$OOINSTDIR/ure/lib/cli_cppuhelper.config

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Tue Aug 12 19:03:14 2008
@@ -302,6 +302,11 @@
 # they don't appear in the RPM file lists.
 rm -Rf $OOINSTDIR/share/uno_packages/cache/*
 
+# FIXME: we need to packagethe extensions some way
+if test -n "$OODESTDIR" ; then
+    rm -f $OOINSTDIR/share/extension/install/scsolver.uno.oxt
+fi
+
 echo "Done";
 
 remove_help_localization()
@@ -700,6 +705,19 @@
 	# add the files from GAC if it was installed
 	test -f mono_gac && cat mono_gac >>mono_list.txt
 
+	# mailmerge
+	if test "$SPLIT_OPT_FEATURES" = "YES" ; then
+		if test "z$VENDORNAME" = "zMandriva" ; then
+			flist=pyuno_list.txt
+		else
+			flist=mailmerge_list.txt
+			rm -f $flist
+		fi
+		mv_file_between_flists $flist common_list.txt $OOINSTBASE/basis$VERSION/program/mailmerge.py
+		mv_file_between_flists $flist common_list.txt $OOINSTBASE/basis$VERSION/share/registry/modules/org/openoffice/Office/Writer/Writer-javamail.xcu
+		add_used_directories $flist common_list.txt
+	fi
+
 	if test "z$VENDORNAME" = "zNovell" ; then
 		# officebean subpackage
 		rm -f officebean_list.txt

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Aug 12 19:03:14 2008
@@ -381,17 +381,17 @@
 [ swextFixes ]
 wiki-publisher-no-license.diff
 
-build-java-target-swext.diff
+#build-java-target-swext.diff
 
 [ Linux32OnlySwextFixes ]
 # originally part of build-java-target.diff, but had to split out
 # because of CR problems
-build-java-target-codec-patch-with-crs.diff, pmladek
+# build-java-target-codec-patch-with-crs.diff, pmladek
 
 [ Win32OnlySwextFixes ]
 # originally part of build-java-target.diff, but had to split out
 # because of CR problems
-build-java-target-codec-patch-without-crs.diff, pmladek
+# build-java-target-codec-patch-without-crs.diff, pmladek
 
 [ NovellOnlySwextFixes ]
 # allow build with ant-1.6