be more lenient wrt patched epm

commit c3ab3df9
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

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])

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");

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);