Rebased ref, commits from common ancestor:
commit d7341319aae973b3b4a7fe601add79dca8f9e69e
Author: Thorsten Behrens <thorsten.behr...@cib.de>
AuthorDate: Tue Jun 11 01:51:23 2019 +0200
Commit: Thorsten Behrens <thorsten.behr...@cib.de>
CommitDate: Tue Jun 11 06:31:15 2019 +0200
Hack to make rpmbuild get a proper build root
Otherwise rpm BUILDROOT will contain spaces, and things break
at various places during packaging
Change-Id: I20229ce533913fa000978aa84b1a2a5d998da14d
diff --git a/solenv/bin/modules/installer/download.pm
b/solenv/bin/modules/installer/download.pm
index 63103816e89f..c1776053ec1e 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -290,7 +290,7 @@ sub get_downloadname_productname
my $start = "";
- $start = $allvariables->{'PRODUCTNAME'};
+ $start = $allvariables->{'PRODUCTNAME'}; $start =~ s/ /_/g;
return $start;
}
diff --git a/solenv/bin/modules/installer/setupscript.pm
b/solenv/bin/modules/installer/setupscript.pm
index 6eefe01f0bd5..4a5a1003cb3e 100644
--- a/solenv/bin/modules/installer/setupscript.pm
+++ b/solenv/bin/modules/installer/setupscript.pm
@@ -166,7 +166,7 @@ sub add_lowercase_productname_setupscriptvariable
$newline = "\%MASKEDPRODUCTNAME " . $value . "\n";
push(@{$variablesref} ,$newline);
$value = $original;
- $value =~ s/\s/\_/g;
+ $value =~ s/\s//g;
$newline = "\%UNIXPRODUCTNAME " . lc($value) . "\n";
push(@{$variablesref} ,$newline);
$newline = "\%SYSTEMINTUNIXPACKAGENAME " . lc($value) . "\n";
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
