rpms/perl
5
0
Fork 0
Code Issues Pull Requests Releases Activity

perl_default_filter macro does not filter private libraries from provides

Browse Source
This commit is contained in:
Petr Písař 2013-10-22 08:47:11 +02:00
parent 3f914aa9cf
commit c954fb6e86
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
macros.perl
View File

@ -35,14 +35,16 @@ export PERL_MM_USE_DEFAULT=1
%global __perl_requires /usr/lib/rpm/perl.req %global __perl_requires /usr/lib/rpm/perl.req
# By default, for perl packages we want to filter all files in _docdir from # 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 # req/prov scanning.
# libs in vendorarch/archlib (vendor/core). # 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 # Note that this must be invoked in the spec file, preferably as
# "%{?perl_default_filter}", before any %description block. # "%{?perl_default_filter}", before any %description block.
%perl_default_filter %{expand: \ %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 __requires_exclude_from %{_docdir}
%global __provides_exclude perl\\\\(VMS|perl\\\\(Win32|perl\\\\(DB\\\\)|perl\\\\(UNIVERSAL\\\\) %global __provides_exclude perl\\\\(VMS|perl\\\\(Win32|perl\\\\(DB\\\\)|perl\\\\(UNIVERSAL\\\\)
%global __requires_exclude perl\\\\(VMS|perl\\\\(Win32 %global __requires_exclude perl\\\\(VMS|perl\\\\(Win32

9
perl.spec
View File

@ -13,8 +13,7 @@
# This overrides filters from build root (/etc/rpm/macros.perl) # This overrides filters from build root (/etc/rpm/macros.perl)
# intentionally (unversioned perl(DB) is removed and versioned one is kept) # intentionally (unversioned perl(DB) is removed and versioned one is kept)
# Filter provides from *.pl files, bug #924938 # Filter provides from *.pl files, bug #924938
# Filter *.so file from auto subdir only to keep providing libperl.so %global __provides_exclude_from .*%{_docdir}|.*%{perl_archlib}/.*\\.pl$|.*%{perl_privlib}/.*\\.pl$
%global __provides_exclude_from .*/auto/.*\\.so$|.*%{_docdir}|.*%{perl_archlib}/.*\\.pl$|.*%{perl_privlib}/.*\\.pl$
%global __requires_exclude_from %{_docdir} %global __requires_exclude_from %{_docdir}
%global __provides_exclude perl\\((VMS|Win32|BSD::|DB\\)$) %global __provides_exclude perl\\((VMS|Win32|BSD::|DB\\)$)
# unicore::Name - it's needed by perl, maybe problem of rpm # unicore::Name - it's needed by perl, maybe problem of rpm
@ -31,7 +30,7 @@
Name: perl Name: perl
Version: %{perl_version} Version: %{perl_version}
# release number must be even higher, because dual-lived modules will be broken otherwise # release number must be even higher, because dual-lived modules will be broken otherwise
Release: 288%{?dist} Release: 289%{?dist}
Epoch: %{perl_epoch} Epoch: %{perl_epoch}
Summary: Practical Extraction and Report Language Summary: Practical Extraction and Report Language
Group: Development/Languages Group: Development/Languages
@ -3626,6 +3625,10 @@ sed \
# Old changelog entries are preserved in CVS. # Old changelog entries are preserved in CVS.
%changelog %changelog
* Tue Oct 22 2013 Petr Pisar <ppisar@redhat.com> - 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@redhat.com> - 4:5.18.1-288 * Mon Sep 09 2013 Jitka Plesnikova <jplesnik@redhat.com> - 4:5.18.1-288
- Fix rules for parsing numeric escapes in regexes (bug #978233) - Fix rules for parsing numeric escapes in regexes (bug #978233)
- Fix crash with \&$glob_copy (bug #989486) - Fix crash with \&$glob_copy (bug #989486)