Fix Ligthproof extension integration

* Fix configure and download support
* Extension naming scheme is: <md5>-<extension-name>_<version>.oxt
  - Renamed extensions
* Rename extension version number in download script and scp2 module

Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>

5 files changed, 21 insertions, 8 deletions

diff --git a/configure.in b/configure.in
index 73e86aa6d..81ed085d6 100755
--- a/configure.in
+++ b/configure.in
@@ -7106,7 +7106,7 @@ if test "z$enable_ext_lightproof" = "z" -o "z$enable_ext_lightproof" = "zno" ; t
     AC_MSG_RESULT([no integration])
 else
     SCPDEFS="$SCPDEFS -DWITH_EXTENSION_LIGHTPROOF"
-    lightproof_supported_langs="hu"
+    lightproof_supported_langs="en-US hu"
     if test "z$enable_ext_lightproof" = "zyes" ; then
         wanted_lightproof="$lightproof_supported_langs"
     else
@@ -7119,15 +7119,23 @@ else
     done
     fi
     LIGHTPROOF_LANG=
+    LIGHTPROOF_HU_PACK=
+    LIGHTPROOF_EN_US_PACK=
     # check whether the langs are requested at all
     for lang in $wanted_lightproof ; do
     if test "$with_lang" = "ALL" -o -n "`echo $with_lang | grep "$lang"`" ; then
         LIGHTPROOF_LANG="$LIGHTPROOF_LANG $lang"
+        case $lang in
+        "hu") LIGHTPROOF_HU_PACK="324ddcb9ef45c3bc055fcc002bc4e556-lightproof-hu_1.2.oxt";;
+        "en-US") LIGHTPROOF_EN_US_PACK="942541da5f5498214518c8b459ae4524-lightproof-en-US_0.1.oxt";;
+    esac
     fi
     done
     AC_MSG_RESULT([$LIGHTPROOF_LANG])
 fi
 AC_SUBST(LIGHTPROOF_LANG)
+AC_SUBST(LIGHTPROOF_HU_PACK)
+AC_SUBST(LIGHTPROOF_EN_US_PACK)
 
 dnl ===================================================================
 dnl Test whether to include Watch Window extension
@@ -7196,7 +7204,7 @@ else
   AC_MSG_RESULT([yes])
   BUILD_TYPE="$BUILD_TYPE CT2N"
   SCPDEFS="$SCPDEFS -DWITH_EXTENSION_CT2N"
-  CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt"
+  CT2N_EXTENSION_PACK="451ccf439a36a568653b024534669971-ConvertTextToNumber_1.3.2.oxt"
 fi
 AC_SUBST(CT2N_EXTENSION_PACK)
 
@@ -7224,7 +7232,7 @@ if test "z$enable_ext_hunart" = "z" -o "z$enable_ext_hunart" = "zno" ; then
 else
   AC_MSG_RESULT([yes])
   SCPDEFS="$SCPDEFS -DWITH_EXTENSION_HUNART"
-  HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart-0.3.oxt"
+  HUNART_EXTENSION_PACK="b632bdd25649cc4067bcb410bae23d2b-hunart_0.3.oxt"
 fi
 AC_SUBST(HUNART_EXTENSION_PACK)
 
@@ -7238,7 +7246,7 @@ if test "z$enable_ext_typo" = "z" -o "z$enable_ext_typo" = "zno" ; then
 else
   AC_MSG_RESULT([yes])
   SCPDEFS="$SCPDEFS -DWITH_EXTENSION_TYPO"
-  TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo-0.4.2.oxt"
+  TYPO_EXTENSION_PACK="9d60b6cfa3ef1926848710bbcd11115b-typo_0.4.2.oxt"
 fi
 AC_SUBST(TYPO_EXTENSION_PACK)
 
diff --git a/download b/download
index abe4c7942..127be9e09 100755
--- a/download
+++ b/download
@@ -298,9 +298,9 @@ 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 ; 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; do
     check_file $TARFILE_LOCATION/$pack
-    packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2 | cut --delimiter=_ --fields=1`
+    packfilename=`echo "$pack" | cut --only-delimited --delimiter=- --fields=2- | cut --delimiter=_ --fields=1`
     echo "Copy extension: '$pack' as '$packfilename.oxt' ..."
     mkdir -p $SRC_ROOT/extras/source/extensions/ || exit 1
     cp $TARFILE_LOCATION/$pack $SRC_ROOT/extras/source/extensions/$packfilename.oxt || exit 1
diff --git a/ooo.lst.in b/ooo.lst.in
index f20a385e9..c4084d0ee 100644
--- a/ooo.lst.in
+++ b/ooo.lst.in
@@ -99,4 +99,6 @@ http://ooo.itc.hu/oxygenoffice/download/libreoffice/
 @HUNART_EXTENSION_PACK@
 @TYPO_EXTENSION_PACK@
 @GOOGLE_DOCS_EXTENSION_PACK@
+@LIGHTPROOF_EN_US_PACK@
+@LIGHTPROOF_HU_PACK@
 
diff --git a/scp2/source/extensions/file_extensions.scp b/scp2/source/extensions/file_extensions.scp
index b8919bcad..ff6117877 100644
--- a/scp2/source/extensions/file_extensions.scp
+++ b/scp2/source/extensions/file_extensions.scp
@@ -112,8 +112,8 @@ File gid_File_Oxt_LightProof
     TXT_FILE_BODY;
     Styles = (PACKED, ARCHIVE);
     Dir = gid_Brand_Dir_Share_Extensions_LightProof;
-    Name (en-US) = "lightproof-en-US-0.1.oxt";
-    Name (hu) = "lightproof-hu-1.2.oxt";
+    Name (en-US) = "lightproof-en-US.oxt";
+    Name (hu) = "lightproof-hu.oxt";
 End
 
 #endif
diff --git a/set_soenv.in b/set_soenv.in
index 522de78b2..6e99498e5 100755
--- a/set_soenv.in
+++ b/set_soenv.in
@@ -1887,6 +1887,9 @@ 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( "LIGHTPROOF_EN_US_PACK", "@LIGHTPROOF_EN_US_PACK@","e" );
+ToFile( "LIGHTPROOF_HU_PACK", "@LIGHTPROOF_HU_PACK@","e" );
+ToFile( "LIGHTPROOF_LANG",   "@LIGHTPROOF_LANG@",  "e" );
 ToFile( "WITH_FONTS",        "@WITH_FONTS@",       "e" );
 ToFile( "WITH_AGFA_MONOTYPE_FONTS",  "@WITH_AGFA_MONOTYPE_FONTS@", "e" );
 ToFile( "WITHOUT_AFMS",      "@WITHOUT_AFMS@",     "e" );