commit 0c4778d8b72569597beb026ed6974f2101ec03b2
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Tue Oct 22 09:38:22 2013 +0200
Append and anchor filters
macros.perl | 8 ++++----
perl.spec | 2 ++
2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/macros.perl b/macros.perl
index b490fe5..83d86fb 100644
--- a/macros.perl
+++ b/macros.perl
@@ -44,10 +44,10 @@ export PERL_MM_USE_DEFAULT=1
# "%{?perl_default_filter}", before any %description block.
%perl_default_filter %{expand: \
-%global __provides_exclude_from %{_docdir}
-%global __requires_exclude_from %{_docdir}
-%global __provides_exclude perl\\\\(VMS|perl\\\\(Win32|perl\\\\(DB\\\\)|perl\\\\(UNIVERSAL\\\\)
-%global __requires_exclude perl\\\\(VMS|perl\\\\(Win32
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}^%{_docdir}
+%global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}^%{_docdir}
+%global __provides_exclude %{?__provides_exclude:%__provides_exclude|}^perl\\\\(VMS|^perl\\\\(Win32|^perl\\\\(DB\\\\)|^perl\\\\(UNIVERSAL\\\\)
+%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\\\(VMS|^perl\\\\(Win32
}
#############################################################################
diff --git a/perl.spec b/perl.spec
index a4a1cf5..3a664f1 100644
--- a/perl.spec
+++ b/perl.spec
@@ -3628,6 +3628,8 @@ sed \
* Tue Oct 22 2013 Petr Pisar <ppisar@xxxxxxxxxx> - 4:5.18.1-289
- perl_default_filter macro does not need to filter private libraries from
provides (bug #1020809)
+- perl_default_filter anchors the filter regular expressions
+- perl_default_filter appends the filters instead of redefining them
* Mon Sep 09 2013 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 4:5.18.1-288
- Fix rules for parsing numeric escapes in regexes (bug #978233)
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
