diff options
| author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-03-26 04:01:02 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-03-26 04:02:14 +0200 |
| commit | 8724bcff1e4c9e666125927659db747b483401c3 (patch) | |
| tree | 14d18cbcea8c9c89c45d7e910be632342dde028d | |
| parent | 49f8917cd4c10685645128768a2dc63043a7b398 (diff) | |
Fix gpgme packaging
Change-Id: I26ef55b8a7a210f9d86becd4f0aa10c2598681fd
| -rw-r--r-- | RepositoryExternal.mk | 2 | ||||
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 75897bc7799e..ed00ea4a9dac 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3413,7 +3413,7 @@ $(call gb_LinkTarget_use_package,$(1),gpgme) endef $(eval $(call gb_Helper_register_packages_for_install,ooo,\ - gpgmepp \ + gpgme \ libassuan \ libgpg-error \ )) diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index 7670535715ea..decf519eb881 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -325,7 +325,7 @@ sub check_logfile $compareline =~ s/Error\.html//g; # removing all occurrences of "Error.html" $compareline =~ s/error\.py//g; # removing all occurrences of "error.py" $compareline =~ s/error\.cpython\-3.(\.opt\-.|)\.py[co]//g; # removing all occurrences of "error-cpython" - $compareline =~ s/libgpg-error-0.dll//g; + $compareline =~ s/libgpg-error//g; $compareline =~ s/Error-xref\.html//g; if ( $compareline =~ /\bError\b/i ) |