diff options
| author | Andras Timar <atimar@suse.com> | 2011-12-12 10:00:41 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2011-12-12 10:01:20 +0100 |
| commit | 9ab205afe55b2121fbcd1b1cae651f5be839cf97 (patch) | |
| tree | 99922b9342bbde6b886431e34085e25dd69d2daa | |
| parent | d1a1585c30c31dec38d32571e9c2b4444bee4d03 (diff) | |
change PRODUCTNAME back to LOdev, because prev. change broke Linux packaging
| -rw-r--r-- | instsetoo_native/util/openoffice.lst | 6 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/download.pm | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index b9260703f7fb..97072fe519ca 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -107,7 +107,7 @@ LibreOffice_Dev { variables { - PRODUCTNAME LibO-dev + PRODUCTNAME LOdev PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION @@ -254,7 +254,7 @@ LibreOffice_Dev_SDK downloadname LibO-Dev-SDK_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME LibO-dev + PRODUCTNAME LOdev PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION @@ -346,7 +346,7 @@ LibreOffice_Dev_Test downloadname LO-Dev-Test_{packageversion}_{os}_install_{languages} variables { - PRODUCTNAME LibO-dev + PRODUCTNAME LOdev PRODUCTVERSION 3.6 PRODUCTEXTENSION LONG_PRODUCTEXTENSION diff --git a/solenv/bin/modules/installer/download.pm b/solenv/bin/modules/installer/download.pm index 246adea59484..5f186b7be9d8 100644 --- a/solenv/bin/modules/installer/download.pm +++ b/solenv/bin/modules/installer/download.pm @@ -394,15 +394,15 @@ sub get_downloadname_productname if ( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) { $start = "LibO"; } - if ( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) { $start = "LibO-Dev"; } + if ( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) { $start = "LibO-Dev"; } if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-SDK"; } - if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; } + if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "SDK" )) { $start = "LibO-Dev-SDK"; } if (( $allvariables->{'PRODUCTNAME'} eq "LibreOffice" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Test"; } - if (( $allvariables->{'PRODUCTNAME'} eq "LibO-dev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Dev-Test"; } + if (( $allvariables->{'PRODUCTNAME'} eq "LOdev" ) && ( $allvariables->{'POSTVERSIONEXTENSION'} eq "TEST" )) { $start = "LibO-Dev-Test"; } if ( $allvariables->{'PRODUCTNAME'} eq "URE" ) { $start = "LibO-URE"; } |