ooo-build r11743 - in trunk: . bin

[mrl svn gnome org]

Author: mrl
Date: Thu Feb 28 18:12:47 2008
New Revision: 11743
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11743&view=rev

Log:
2008-02-28  Marcelo Ricardo Leitner <mrl mandriva com>

	* bin/package-ooo: Cleanup on file movings 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 Feb 28 18:12:47 2008
@@ -689,36 +689,31 @@
 		# Move arch-dependent/dup files from common to core
 		rm -f core_list.txt
 		for f in \
+			"\.so" \
+			"\.so\..*" \
+			"program/.*\.rdb" \
+			program/configimport.bin \
 			program/javaldx \
 			program/msfontextract \
 			program/nsplugin \
+			program/oosplash.bin \
 			program/pagein \
 			program/pagein-calc \
 			program/pagein-common \
 			program/pagein-draw \
 			program/pagein-impress \
-			program/pagein-writer
+			program/pagein-writer \
+			program/pkgchk.bin \
+			program/pluginapp.bin \
+			program/setofficelang.bin \
+			program/soffice.bin \
+			program/spadmin.bin \
+			program/uno.bin \
+			program/unopkg.bin \
+			program/uri-encode
 		do
-			mv_file_between_flists core_list.txt common_list.txt $OOINSTBASE/$f
+			mv_file_between_flists core_list.txt common_list.txt "$OOINSTBASE/$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/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 core_list.txt $OOINSTBASE/program/gnome-open-url.bin