ooo-build r12122 - in trunk: . bin

[pmladek svn gnome org]

Author: pmladek
Date: Mon Apr  7 16:21:54 2008
New Revision: 12122
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12122&view=rev

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

	* bin/package-ooo: (NovellOnly) put the icons into a separate package
	  when building the split build

...

2008-04-07  Petr Mladek  <pmladek suse cz>

	* Branched for SLED10-SP2:
          anchor tag SLED_10_SP2_OOO_BUILD_2_4_ANCHOR
          branch sled-10-sp2-ooo-build-2-4



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

Modified: trunk/bin/package-ooo
==============================================================================
--- trunk/bin/package-ooo	(original)
+++ trunk/bin/package-ooo	Mon Apr  7 16:21:54 2008
@@ -588,15 +588,6 @@
 		merge_flists gid_Module_Pyuno_Hack	$BUILDDIR/common_list.txt
 	fi
 	
-	if test "$VENDORNAME" = "Novell" -a "$SPLIT_APP_MODULES" = "YES" ; then
-		# bin icons and pack them later in a noarch package
-		remove_file $BUILDDIR/common_list.txt $OOINSTBASE/share/config/images_crystal.zip
-		remove_file $BUILDDIR/common_list.txt $OOINSTBASE/share/config/images_hicontrast.zip
-		remove_file $BUILDDIR/common_list.txt $OOINSTBASE/share/config/images_industrial.zip
-		remove_file $BUILDDIR/common_list.txt $OOINSTBASE/share/config/images_tango.zip
-		remove_file $BUILDDIR/common_list.txt $OOINSTBASE/share/config/images.zip
-	fi
-	
 	if test "$VENDORNAME" = "Novell" ; then
 		cat $BUILDDIR/novell-gallery-addon >> $BUILDDIR/common_list.txt
 	fi
@@ -678,6 +669,18 @@
 		add_used_directories sdk_doc_list.txt sdk_list.txt
 	fi	    
 
+	if test "$VENDORNAME" = "Novell" -a "$SPLIT_APP_MODULES" = "YES" ; then
+		# move the prebuilt icons into a hacky temporary package
+		# we want to repack them into a noarch package as soon as possible
+		# without the build dependency on the huge devel package
+		rm -f icon_themes_prebuilt.txt 
+		mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $OOINSTBASE/share/config/images_crystal.zip
+		mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $OOINSTBASE/share/config/images_hicontrast.zip
+		mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $OOINSTBASE/share/config/images_industrial.zip
+		mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $OOINSTBASE/share/config/images_tango.zip
+		mv_file_between_flists icon_themes_prebuilt.txt common_list.txt $OOINSTBASE/share/config/images.zip
+	fi
+	
 	# Mandriva packaging
 	if test "$VENDORNAME" = "Mandriva"; then
 		# Not used