ooo-build r12092 - in trunk: . bin patches/src680

[pmladek svn gnome org]

Author: pmladek
Date: Thu Apr  3 18:09:20 2008
New Revision: 12092
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12092&view=rev

Log:
2008-04-03  Petr Mladek  <pmladek suse cz>

	* patches/src680/apply: disable cjk-character-units-ui.diff,
	  cjk-character-units-imp.diff, cjk-character-units-fix.diff,
	  cjk-character-units-rulers-sync-with-pggrid-fix.diff,
	  cjk-punctuation-compress.diff: they caused some problems, n#376788

	* bin/package-ooo: (NovellOnly) allow to create the other branding in
	  noarch packages



Modified:
   trunk/ChangeLog
   trunk/bin/package-ooo
   trunk/patches/src680/apply

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Thu Apr  3 18:09:20 2008
@@ -431,6 +431,18 @@
     chmod go-w $OOINSTDIR/sdk/settings/component.uno.map
 fi
 
+if test "$DISTRO" = "SUSE" || ! echo "$DISTRO" | grep -q "SUSE-10" ; then
+    # branding stuff for openSUSE >= 11.0 and SLED >= 11
+    mkdir -p $DATADIR/$OOOINSTALLDIRNAME/program
+    echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME" >$BUILDDIR/upstream_branding_list.txt
+    echo "%dir $DATADIRBASE/$OOOINSTALLDIRNAME/program" >>$BUILDDIR/upstream_branding_list.txt
+    for file in about.bmp intro.bmp ; do
+	mv $OOINSTDIR/program/$file $DATADIR/$OOOINSTALLDIRNAME/program/$file
+	ln -sf $DATADIRBASE/$OOOINSTALLDIRNAME/program/$file $OOINSTDIR/program/$file
+	echo "$DATADIRBASE/$OOOINSTALLDIRNAME/program/$file" >>$BUILDDIR/upstream_branding_list.txt
+    done
+fi
+
 # remove installed file even from the file list
 # Params: file_list file_to_remove
 remove_file()
@@ -652,14 +664,6 @@
 		add_used_directories officebean_list.txt common_list.txt
 	fi
 
-	if test "$DISTRO" = "SUSE" || ! echo "$DISTRO" | grep -q "SUSE-10" ; then
-		# upstream branding subpackage (only for openSUSE >= 11.0 and SLED >= 11)
-		rm -f upstream_branding_list.txt
-		mv_file_between_flists upstream_branding_list.txt common_list.txt $OOINSTBASE/program/about.bmp
-		mv_file_between_flists upstream_branding_list.txt common_list.txt $OOINSTBASE/program/intro.bmp
-		add_used_directories upstream_branding_list.txt common_list.txt
-	fi
-
 	if test -f sdk_list.txt ; then
 		rm -f sdk_doc_list.txt
 		# in this case we move all entries including directories

Modified: trunk/patches/src680/apply
==============================================================================
--- trunk/patches/src680/apply	(original)
+++ trunk/patches/src680/apply	Thu Apr  3 18:09:20 2008
@@ -231,13 +231,13 @@
 cws-cjksp1-xmloff.diff, Fong Lin
 
 # add a new unit 'character unit'
-cjk-character-units-ui.diff, Amelia Wang
-cjk-character-units-imp.diff, Amelia Wang
-cjk-character-units-rulers-sync-with-pggrid-fix.diff, Amelia Wang
-cjk-character-units-fix.diff, i#356101, Amelia Wang 
+#cjk-character-units-ui.diff, Amelia Wang
+#cjk-character-units-imp.diff, Amelia Wang
+#cjk-character-units-rulers-sync-with-pggrid-fix.diff, Amelia Wang
+#cjk-character-units-fix.diff, i#356101, Amelia Wang 
 
 # text layout enhancement for better CJK support
-cjk-punctuation-compress.diff, Amelia Wang
+#cjk-punctuation-compress.diff, Amelia Wang
 
 #[ CJKTemporaryHacks ]
 # the following patch is disabled temporary.