commit c954fb6e868302112aae1d375724d08d3d35cf20
Author: Petr Písař <ppisar@xxxxxxxxxx>
Date: Tue Oct 22 08:47:11 2013 +0200
perl_default_filter macro does not filter private libraries from provides
macros.perl | 8 +++++---
perl.spec | 9 ++++++---
2 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/macros.perl b/macros.perl
index dc10c03..b490fe5 100644
--- a/macros.perl
+++ b/macros.perl
@@ -35,14 +35,16 @@ export PERL_MM_USE_DEFAULT=1
%global __perl_requires /usr/lib/rpm/perl.req
# By default, for perl packages we want to filter all files in _docdir from
-# req/prov scanning, as well as filtering out any provides caused by private
-# libs in vendorarch/archlib (vendor/core).
+# req/prov scanning.
+# Filtering out any provides caused by private libs in vendorarch/archlib
+# (vendor/core) is done by rpmbuild since Fedora 20
+# <https://fedorahosted.org/fpc/ticket/353>.
#
# Note that this must be invoked in the spec file, preferably as
# "%{?perl_default_filter}", before any %description block.
%perl_default_filter %{expand: \
-%global __provides_exclude_from %{perl_vendorarch}/auto/.*\\\\.so$|%{perl_archlib}/.*\\\\.so$|%{_docdir}
+%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
diff --git a/perl.spec b/perl.spec
index fa3974a..a4a1cf5 100644
--- a/perl.spec
+++ b/perl.spec
@@ -13,8 +13,7 @@
# This overrides filters from build root (/etc/rpm/macros.perl)
# intentionally (unversioned perl(DB) is removed and versioned one is kept)
# Filter provides from *.pl files, bug #924938
-# Filter *.so file from auto subdir only to keep providing libperl.so
-%global __provides_exclude_from .*/auto/.*\\.so$|.*%{_docdir}|.*%{perl_archlib}/.*\\.pl$|.*%{perl_privlib}/.*\\.pl$
+%global __provides_exclude_from .*%{_docdir}|.*%{perl_archlib}/.*\\.pl$|.*%{perl_privlib}/.*\\.pl$
%global __requires_exclude_from %{_docdir}
%global __provides_exclude perl\\((VMS|Win32|BSD::|DB\\)$)
# unicore::Name - it's needed by perl, maybe problem of rpm
@@ -31,7 +30,7 @@
Name: perl
Version: %{perl_version}
# release number must be even higher, because dual-lived modules will be broken otherwise
-Release: 288%{?dist}
+Release: 289%{?dist}
Epoch: %{perl_epoch}
Summary: Practical Extraction and Report Language
Group: Development/Languages
@@ -3626,6 +3625,10 @@ sed \
# Old changelog entries are preserved in CVS.
%changelog
+* 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)
+
* Mon Sep 09 2013 Jitka Plesnikova <jplesnik@xxxxxxxxxx> - 4:5.18.1-288
- Fix rules for parsing numeric escapes in regexes (bug #978233)
- Fix crash with \&$glob_copy (bug #989486)
--
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
