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

[pmladek svn gnome org]

Author: pmladek
Date: Thu Mar 27 19:37:29 2008
New Revision: 12023
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12023&view=rev

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

	* bin/package-ooo: put upstream branding into extra subpackage
	  for openSUSE >= 11.0



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 Mar 27 19:37:29 2008
@@ -652,6 +652,14 @@
 		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 Mar 27 19:37:29 2008
@@ -908,7 +908,7 @@
 buildfix-xmloff-exportxforms.diff, i#84965
 
 # fix the --enable-reportdesign configure check to work
-buildfix-enable-reportdesign-check.diff, pmladek
+buildfix-enable-reportdesign-check.diff, i#87518, pmladek
 
 [ NovellOnlyWin32 ]
 SectionOwner => tml