From 8fbad2f600cd3ab81e7c1da0e4a2a71ebcac0553 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 31 Jan 2019 10:24:32 +0000
Subject: be more lenient wrt patched epm
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
---
 solenv/bin/modules/installer/epmfile.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'solenv/bin/modules')

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