ooo-build r11304 - in trunk: . bin

[mrl svn gnome org]

Author: mrl
Date: Thu Jan 17 16:46:05 2008
New Revision: 11304
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11304&view=rev

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

	* bin/package-ooo: Fix dupplicated files for Mandriva packaging.


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

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Jan 17 16:46:05 2008
@@ -688,13 +688,24 @@
 		# Ship ooqstart for gnome in gnome package
 		merge_flists ooqstart_list.txt gnome_list.txt
 
-		# Move arch-dependent files from common to core
+		# Move arch-dependent/dup files from common to core
 		rm -f core_list.txt
+		for f in \
+			program/javaldx \
+			program/msfontextract \
+			program/nsplugin \
+			program/pagein \
+			program/pagein-calc \
+			program/pagein-common \
+			program/pagein-draw \
+			program/pagein-impress \
+			program/pagein-writer
+		do
+			mv_file_between_flists core_list.txt common_list.txt $f
+		done
 		#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