[Libreoffice-commits] core.git: configure.ac external/epm solenv/bin

[Libreoffice Gerrit user]

 configure.ac                            |    2 +-
 external/epm/epm-3.7.patch              |    2 +-
 solenv/bin/modules/installer/epmfile.pm |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 8fbad2f600cd3ab81e7c1da0e4a2a71ebcac0553
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Jan 31 10:24:32 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Jan 31 13:39:15 2019 +0100

    be more lenient wrt patched epm
    
    commit c3ab3df902b9e2ad363d1eca14da8f9f7f1567bb
    Date:   Thu Oct 14 09:53:40 2010 +0200
    
    changed the configure.ac to require "Patched by Libreoffice", which was
    possibly an error
    
    Change-Id: I6f8e302baeed054f36b54f8bfb6f5cad826ee788
    Reviewed-on: https://gerrit.libreoffice.org/67199
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/configure.ac b/configure.ac
index bb468640b81e..06223b880b8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7622,7 +7622,7 @@ if test "$enable_epm" = "yes"; then
         if test "$with_epm" = "no" -a "$_os" != "Darwin"; then
             if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then
                 AC_MSG_CHECKING([whether epm is patched for LibreOffice's needs])
-                if grep "Patched for LibreOffice" $EPM >/dev/null 2>/dev/null; then
+                if grep "Patched for .*Office" $EPM >/dev/null 2>/dev/null; then
                     AC_MSG_RESULT([yes])
                 else
                     AC_MSG_RESULT([no])
diff --git a/external/epm/epm-3.7.patch b/external/epm/epm-3.7.patch
index 869c141a7155..167490121b21 100644
--- a/external/epm/epm-3.7.patch
+++ b/external/epm/epm-3.7.patch
@@ -348,7 +348,7 @@ diff -urN epm-3.7-old//epm.c epm-3.7/epm.c
  {
    puts(EPM_VERSION);
    puts("Copyright 1999-2003 by Easy Software Products.");
-+  puts("Patched for OpenOffice.org");
++  puts("Patched for LibreOffice");
    puts("");
    puts("EPM is free software and comes with ABSOLUTELY NO WARRANTY; for details");
    puts("see the GNU General Public License in the file COPYING or at");
diff --git a/solenv/bin/modules/installer/epmfile.pm b/solenv/bin/modules/installer/epmfile.pm
index bc6a76ccf44d..b85648d1e702 100644
--- a/solenv/bin/modules/installer/epmfile.pm
+++ b/solenv/bin/modules/installer/epmfile.pm
@@ -759,7 +759,7 @@ sub set_patch_state
     while (<EPMPATCH>)
     {
         chop;
-        if ( $_ =~ /Patched for OpenOffice.org/ ) { $installer::globals::is_special_epm = 1; }
+        if ( $_ =~ /Patched for .*Office/ ) { $installer::globals::is_special_epm = 1; }
     }
 
     close (EPMPATCH);