From 87885f736d93f47c93edb0374237f06e7a392ae9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Thu, 9 Aug 2018 07:03:37 +0200
Subject: adapt to perl 5.28: fix including stuff from pkgs

need to expand macro when using "matching"
---
 perl-install/install/share/list.xml | 4 ++--
 tools/install-xml-file-list         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/perl-install/install/share/list.xml b/perl-install/install/share/list.xml
index 5b975e8a2..f083d710a 100644
--- a/perl-install/install/share/list.xml
+++ b/perl-install/install/share/list.xml
@@ -630,11 +630,11 @@
   urpm/xml_info_pkg.pm
 </from>
 
-<from expand="rpm" matching="m!/usr/lib/perl5/.*/unicore/lib!">
+<from expand="rpm" matching="m!/usr/share/perl5/unicore/lib!">
   perl
 </from>
 
-<from expand="rpm" matching="m!^/usr/lib/perl5! and !/\.pod$/">
+<from expand="rpm" matching="m!^/usr/(share|LIB)/perl5! and !/\.pod$/">
   perl-Curses
   perl-Curses-UI
   perl-File-FnMatch
diff --git a/tools/install-xml-file-list b/tools/install-xml-file-list
index 5372e7258..0fc8f7a76 100755
--- a/tools/install-xml-file-list
+++ b/tools/install-xml-file-list
@@ -232,7 +232,7 @@ sub install {
 	    @l = all_files_rec_($l[0]);
 	}
 	@l = grep { !m!/(\.svn|CVS)($|/)! } @l;
-	if (my $re = $env->{from}{matching}) {
+	if (my $re = expand_macros($env->{from}{matching})) {
 	    @l = grep { eval $re } @l;
 	}
 
-- 
cgit v1.2.1