Fix SUN Template extension configure, download, handling

5 files changed, 40 insertions, 7 deletions

diff --git a/configure.in b/configure.in
index 116f5d0e2..36f399dff 100755
--- a/configure.in
+++ b/configure.in
@@ -7288,15 +7288,35 @@ else
     done
     fi
     SUNTEMPLATES_LANG=
+    SUNTEMPLATES_DE_PACK=
+    SUNTEMPLATES_EN_US_PACK=
+    SUNTEMPLATES_ES_PACK=
+    SUNTEMPLATES_FR_PACK=
+    SUNTEMPLATES_HU_PACK=
+    SUNTEMPLATES_IT_PACK=
     # check whether the langs are requested at all
     for lang in $wanted_sun_templates ; do
     if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
         SUNTEMPLATES_LANG="$SUNTEMPLATES_LANG $lang"
+        case $lang in
+        	"de") SUNTEMPLATES_DE_PACK="53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt";;
+        	"en-US") SUNTEMPLATES_EN_US_PACK="472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt";;
+        	"es") SUNTEMPLATES_ES_PACK="4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt";;
+        	"fr") SUNTEMPLATES_FR_PACK="a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt";;
+        	"hu") SUNTEMPLATES_HU_PACK="09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt";;
+        	"it") SUNTEMPLATES_IT_PACK="b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt";;
+    	esac        
     fi
     done
     AC_MSG_RESULT([$SUNTEMPLATES_LANG])
 fi
 AC_SUBST(SUNTEMPLATES_LANG)
+AC_SUBST(SUNTEMPLATES_DE_PACK)
+AC_SUBST(SUNTEMPLATES_EN_US_PACK)
+AC_SUBST(SUNTEMPLATES_ES_PACK)
+AC_SUBST(SUNTEMPLATES_FR_PACK)
+AC_SUBST(SUNTEMPLATES_HU_PACK)
+AC_SUBST(SUNTEMPLATES_IT_PACK)
 
 dnl ===================================================================
 dnl Test whether to include fonts
diff --git a/download b/download
index b7ef885c1..378b744a0 100755
--- a/download
+++ b/download
@@ -264,7 +264,7 @@ done
 
 # Extensions copy
 echo "Copy extensions to their location ..."
-for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK; do
+for pack in $BARCODE_EXTENSION_PACK $DIAGRAM_EXTENSION_PACK $VALIDATOR_EXTENSION_PACK $WATCH_WINDOW_EXTENSION_PACK $NUMBERTEXT_EXTENSION_PACK $HUNART_EXTENSION_PACK $TYPO_EXTENSION_PACK $GOOGLE_DOCS_EXTENSION_PACK $LIGHTPROOF_HU_PACK $LIGHTPROOF_EN_US_PACK $SUNTEMPLATES_DE_PACK $SUNTEMPLATES_EN_US_PACK $SUNTEMPLATES_ES_PACK $SUNTEMPLATES_FR_PACK $SUNTEMPLATES_HU_PACK $SUNTEMPLATES_IT_PACK; do
     check_file $TARFILE_LOCATION/$pack
     packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2- | cut --delimiter=_ --fields=1`
     echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
diff --git a/ooo.lst.in b/ooo.lst.in
index c6248cbbb..11dc1e503 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -100,4 +100,10 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 @GOOGLE_DOCS_EXTENSION_PACK@
 @LIGHTPROOF_EN_US_PACK@
 @LIGHTPROOF_HU_PACK@
+@SUNTEMPLATES_DE_PACK@
+@SUNTEMPLATES_EN_US_PACK@
+@SUNTEMPLATES_ES_PACK@
+@SUNTEMPLATES_FR_PACK@
+@SUNTEMPLATES_HU_PACK@
+@SUNTEMPLATES_IT_PACK@
 
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index ff6117877..a2b48ecba 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -295,12 +295,12 @@ File gid_File_Optional_Extensions_Sun_Template_Pack
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_Sun_Template_Pack;
-    Name (en-US) = "Sun_ODF_Template_Pack_en-US.oxt";
-    Name (de) = "Sun_ODF_Template_Pack_de.oxt";
-    Name (it) = "Sun_ODF_Template_Pack_it.oxt";
-    Name (fr) = "Sun_ODF_Template_Pack_fr.oxt";
-    Name (es) = "Sun_ODF_Template_Pack_es.oxt";
-    Name (hu) = "Sun_ODF_Template_Pack_hu.oxt";
+    Name (en-US) = "Sun-ODF-Template-Pack-en-US.oxt";
+    Name (de) = "Sun-ODF-Template-Pack-de.oxt";
+    Name (it) = "Sun-ODF-Template-Pack-it.oxt";
+    Name (fr) = "Sun-ODF-Template-Pack-fr.oxt";
+    Name (es) = "Sun-ODF-Template-Pack-es.oxt";
+    Name (hu) = "Sun-ODF-Template-Pack-hu.oxt";
 End
 
 #endif
diff --git a/set_soenv.in b/set_soenv.in
index a23f21626..185ce19e4 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1793,6 +1793,13 @@ ToFile( "NUMBERTEXT_EXTENSION_PACK", "@NUMBERTEXT_EXTENSION_PACK@","e" );
 ToFile( "HUNART_EXTENSION_PACK", "@HUNART_EXTENSION_PACK@","e" );
 ToFile( "TYPO_EXTENSION_PACK", "@TYPO_EXTENSION_PACK@","e" );
 ToFile( "GOOGLE_DOCS_EXTENSION_PACK", "@GOOGLE_DOCS_EXTENSION_PACK@","e" );
+ToFile( "SUNTEMPLATES_LANG", "@SUNTEMPLATES_LANG@","e" );
+ToFile( "SUNTEMPLATES_DE_PACK", "@SUNTEMPLATES_DE_PACK@","e" );
+ToFile( "SUNTEMPLATES_EN_US_PACK", "@SUNTEMPLATES_EN_US_PACK@","e" );
+ToFile( "SUNTEMPLATES_ES_PACK", "@SUNTEMPLATES_ES_PACK@","e" );
+ToFile( "SUNTEMPLATES_FR_PACK", "@SUNTEMPLATES_FR_PACK@","e" );
+ToFile( "SUNTEMPLATES_HU_PACK", "@SUNTEMPLATES_HU_PACK@","e" );
+ToFile( "SUNTEMPLATES_IT_PACK", "@SUNTEMPLATES_IT_PACK@","e" );
 ToFile( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
 ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
 ToFile( "LIGHTPROOF_LANG",   "@LIGHTPROOF_LANG@",  "e" );