diff -r 7911e95d7847 -r 4d4d275a712a perl/perl.spec --- a/perl/perl.spec Thu Aug 09 19:02:16 2012 +0200 +++ b/perl/perl.spec Thu Aug 09 19:04:25 2012 +0200 @@ -1,6 +1,6 @@ ## ## perl.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2011 OpenPKG Foundation e.V. +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -31,20 +31,16 @@ Class: CORE Group: Perl License: GPL/Artistic -Version: 5.14.1 -Release: 20110914 +Version: 5.16.0 +Release: 20120712 # list of sources Source0: http://www.cpan.org/src/perl-%{version}.tar.gz Patch0: perl.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc -PreReq: OpenPKG, openpkg >= 20060823 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc +PreReq: OpenPKG, openpkg >= 20100101 %description Perl ("Practical Reporting and Extraction Language") is a very @@ -119,8 +115,6 @@ %{l_make} %{l_mflags} -f Makefile %install - # remove build cruft - rm -rf $RPM_BUILD_ROOT # install the Perl package via standard procedure %{l_make} %{l_mflags} -f Makefile install DESTDIR=$RPM_BUILD_ROOT @@ -201,18 +195,23 @@ # resolve file conflicts (with perl-sys) rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/ptar \ $RPM_BUILD_ROOT%{l_prefix}/bin/ptardiff \ + $RPM_BUILD_ROOT%{l_prefix}/bin/ptargrep \ $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptar.1 \ - $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptargrep.1 # resolve file conflicts (with perl-crypto) 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} %files -f files %clean - rm -rf $RPM_BUILD_ROOT