ooo-build r11274 - in trunk: . bin

[mrl svn gnome org]

Author: mrl
Date: Tue Jan 15 18:30:59 2008
New Revision: 11274
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11274&view=rev

Log:
2008-01-15  Marcelo Ricardo Leitner  <mrl mandriva com>

	* bin/package-ooo: updates Mandriva packaging.


Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Tue Jan 15 18:30:59 2008
@@ -520,16 +520,30 @@
 	if test "$SPLIT_OPT_FEATURES" = "YES" ; then
 		rm -f $BUILDDIR/filters_list.txt $BUILDDIR/mailmerge_list.txt \
 		      $BUILDDIR/pyuno_list.txt $BUILDDIR/testtool_list.txt
-		merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filters_list.txt
-		merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/common_list.txt
-		merge_flists gid_Module_Optional_Headless		$BUILDDIR/common_list.txt
-		merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/filters_list.txt
-		merge_flists gid_Module_Optional_Pymailmerge		$BUILDDIR/mailmerge_list.txt
-		merge_flists gid_Module_Optional_Pyuno			$BUILDDIR/pyuno_list.txt
-		merge_flists gid_Module_Optional_Testtool		$BUILDDIR/testtool_list.txt
-		merge_flists gid_Module_Optional_Xsltfiltersamples	$BUILDDIR/filters_list.txt
-		# pyuno hack for x86_64
-		merge_flists gid_Module_Pyuno_Hack	$BUILDDIR/pyuno_list.txt
+		if test "z$VENDORNAME" != "zMandriva" ; then
+			merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filters_list.txt
+			merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/common_list.txt
+			merge_flists gid_Module_Optional_Headless		$BUILDDIR/common_list.txt
+			merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/filters_list.txt
+			merge_flists gid_Module_Optional_Pymailmerge		$BUILDDIR/pyuno_list.txt
+			merge_flists gid_Module_Optional_Pyuno			$BUILDDIR/pyuno_list.txt
+			merge_flists gid_Module_Optional_Testtool		$BUILDDIR/testtool_list.txt
+			merge_flists gid_Module_Optional_Xsltfiltersamples	$BUILDDIR/filters_list.txt
+			# pyuno hack for x86_64
+			merge_flists gid_Module_Pyuno_Hack	$BUILDDIR/pyuno_list.txt
+		else
+			rm -f $BUILDDIR/filter-binfilter_list.txt
+			merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/filter-binfilter_list.txt
+			merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/draw_list.txt
+			merge_flists gid_Module_Optional_Headless		$BUILDDIR/common_list.txt
+			merge_flists gid_Module_Optional_Javafilter		$BUILDDIR/common_list.txt
+			merge_flists gid_Module_Optional_Pymailmerge		$BUILDDIR/pyuno_list.txt
+			merge_flists gid_Module_Optional_Pyuno			$BUILDDIR/pyuno_list.txt
+			merge_flists gid_Module_Optional_Testtool		$BUILDDIR/testtool_list.txt
+			merge_flists gid_Module_Optional_Xsltfiltersamples	$BUILDDIR/common_list.txt
+			# pyuno hack for x86_64
+			merge_flists gid_Module_Pyuno_Hack	$BUILDDIR/pyuno_list.txt
+		fi
 	else
 		merge_flists gid_Module_Optional_Binfilter		$BUILDDIR/common_list.txt
 		merge_flists gid_Module_Optional_Grfflt			$BUILDDIR/common_list.txt
@@ -558,10 +572,18 @@
 	
 	for lang in $OOO_LANGS_LIST ; do
 		lang_lists=
-		test -f gid_Module_Root.$lang           	&& lang_lists="gid_Module_Root.$lang" || :
-		test -f gid_Module_Langpack_Help.$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help.$lang" || :
-		test -f gid_Module_Langpack_Resource.$lang	&& lang_lists="$lang_lists gid_Module_Langpack_Resource.$lang" || :
+		if test "$VENDORNAME" != "Mandriva"; then
+			test -f gid_Module_Root.$lang           	&& lang_lists="gid_Module_Root.$lang" || :
+			test -f gid_Module_Langpack_Help.$lang  	&& lang_lists="$lang_lists gid_Module_Langpack_Help.$lang" || :
+			test -f gid_Module_Langpack_Resource.$lang	&& lang_lists="$lang_lists gid_Module_Langpack_Resource.$lang" || :
+		else
+			test -f gid_Module_Root.$lang           	&& lang_lists="gid_Module_Root.$lang" || :
+			test -f gid_Module_Langpack_Resource.$lang	&& lang_lists="$lang_lists gid_Module_Langpack_Resource.$lang" || :
+			# Place helps on dedicated packages.
+			test -f gid_Module_Langpack_Help.$lang  	&& sort -u gid_Module_Langpack_Help.$lang > $BUILDDIR/help_${lang}_list.txt || :
+		fi
 		test -n "$lang_lists" && cat $lang_lists | sort -u >$BUILDDIR/lang_${lang}_list.txt || :
+
 	done
 
 	if test -f gid_Module_Root_SDK ; then
@@ -622,6 +644,88 @@
 		add_used_directories sdk_doc_list.txt sdk_list.txt
 	fi	    
 
+	# Mandriva packaging
+	if test "$VENDORNAME" = "Mandriva"; then
+		# Not used
+		remove_file common_list.txt $OOINSTBASE/share/gallery/htmltheme.orig
+		remove_file common_list.txt $OOINSTBASE/share/dict/ooo/dictionary.lst
+
+		# These filters are in core
+		remove_file draw_list.txt $OOINSTBASE/program/libwpgimport680l?.so
+		remove_file draw_list.txt $OOINSTBASE/program/libflash680l?.so
+		remove_file draw_list.txt $OOINSTBASE/program/libsvgfilter680l?.so
+
+		# And these are in -draw package
+		# FIXME: Fill the paths
+		mv_file_between_flists draw_list.txt common_list.txt fcfg_drawgraphics_filters.xcu
+		mv_file_between_flists draw_list.txt common_list.txt fcfg_drawgraphics_types.xcu
+
+		# And these are in -impress package
+		# FIXME: Fill the paths
+		mv_file_between_flists impress_list.txt common_list.txt fcfg_impressgraphics_filters.xcu
+		mv_file_between_flists impress_list.txt common_list.txt fcfg_impressgraphics_types.xcu
+
+		# Split out the gallery
+		rm -f gallery_list.txt
+		mv_file_between_flists gallery_list.txt common_list.txt "$OOINSTBASE/share/gallery.*"
+		cat galleries.txt >> gallery_list.txt
+
+		# Split out dtd-officedocument1.0
+		rm -f dtd_list.txt
+		mv_file_between_flists dtd_list.txt common_list.txt "$OOINSTBASE/share/dtd/officedocument.*"
+
+		# Split out java stuff
+		rm -f java_common_list.txt
+		mv_file_between_flists java_common_list.txt common_list.txt $OOINSTBASE/program/JREProperties.class
+		mv_file_between_flists java_common_list.txt common_list.txt "$OOINSTBASE/program/classes.*"
+		mv_file_between_flists java_common_list.txt common_list.txt $OOINSTBASE/program/libofficebean.so
+		mv_file_between_flists java_common_list.txt common_list.txt "$OOINSTBASE/share/Scripts/java.*"
+		mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $OOINSTBASE/program/classes/aportisdoc.jar
+		mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $OOINSTBASE/program/classes/pocketword.jar
+		mv_file_between_flists java_common_list.txt filter-binfilter_list.txt $OOINSTBASE/program/classes/pexcel.jar
+		mv_file_between_flists java_common_list.txt writer_list.txt $OOINSTBASE/program/classes/writer2latex.jar
+
+		# Ship ooqstart for gnome in gnome package
+		merge_flists ooqstart_list.txt gnome_list.txt
+
+		# Move arch-dependent files from common to core
+		rm -f core_list.txt
+		#mv_file_between_flists core_list.txt common_list.txt "\.so"
+		#mv_file_between_flists core_list.txt common_list.txt "\.so\..*"
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/configimport.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/javaldx
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/pagein
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/oovbaapi.rdb
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/oosplash.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/pkgchk.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/pluginapp.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/setofficelang.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/services.rdb
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/soffice.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/spadmin.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/types.rdb
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/uno.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/unopkg.bin
+		#mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/program/uri-encode
+
+		# Move all libraries, binaries, *.rdb from -common to -core (from Debian code)
+		mv_file_between_flists core_list.txt common_list.txt '(placeholder\|.*\.so$\|.*\.so\..*\|.*\.bin\|pagein\|nsplugin\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode)'
+
+		# Put gtk/gnome stuff into gnome package
+		mv_file_between_flists gnome_list.txt common_list.txt $OOINSTBASE/program/gnome-open-url.bin
+		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/program/fps_gnome.uno.so
+		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/program/ucpgvfs1.uno.so
+		mv_file_between_flists gnome_list.txt core_list.txt $OOINSTBASE/program/libeggtray680li.so
+
+		# themes are included in other packages
+		# don't use remove_file as we don't want them removed from the buildroot.
+		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/share/config/images_crystal.zip
+		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/share/config/images_hicontrast.zip
+		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/share/config/images_industrial.zip
+		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/share/config/images_tango.zip
+		mv_file_between_flists /dev/null common_list.txt $OOINSTBASE/share/config/images.zip
+	fi
+
 	# remove known duplicities to do not have files packaged in two packages
 	# the Bulgarian fixes can be removed after the issue #54110 is fixed
 	remove_duplicity_from_flists common_list.txt lang_bg_list.txt $OOINSTBASE/presets/config/arrowhd.soe