Browse Source

resolve conflict

master
parent
commit
d6e96144ac
  1. 6
      perl/perl.spec

6
perl/perl.spec

@ -32,7 +32,7 @@ Class: CORE
Group: Perl
License: GPL/Artistic
Version: 5.16.0
Release: 20120531
Release: 20120712
# list of sources
Source0: http://www.cpan.org/src/perl-%{version}.tar.gz
@ -204,6 +204,10 @@ PreReq: OpenPKG, openpkg >= 20100101
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/shasum \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/shasum.1
# resolve file conflicts (with perl-comp)
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/zipdetails \
$RPM_BUILD_ROOT%{l_prefix}/man/man1/zipdetails.1
# determine installed files
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}

Loading…
Cancel
Save