diff -r cce1eb91ccfc -r 832ab278201b perl/perl.spec --- a/perl/perl.spec Thu Sep 15 17:11:15 2011 +0200 +++ b/perl/perl.spec Thu Sep 15 19:29:29 2011 +0200 @@ -1,6 +1,6 @@ ## ## perl.spec -- OpenPKG RPM Package Specification -## Copyright (c) 2000-2008 OpenPKG Foundation e.V. +## Copyright (c) 2000-2011 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.10.0 -Release: 20090106 +Version: 5.14.1 +Release: 20110618 # list of sources -Source0: ftp://ftp.cpan.org/pub/CPAN/src/perl-%{version}.tar.gz +Source0: http://www.cpan.org/src/perl-%{version}.tar.gz Patch0: perl.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, gcc -PreReq: OpenPKG, openpkg >= 20040130 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc +PreReq: OpenPKG, openpkg >= 20100101 %description Perl ("Practical Reporting and Extraction Language") is a very @@ -55,8 +51,8 @@ %track prog perl = { version = %{version} - url = ftp://ftp.cpan.org/pub/CPAN/src/ - regex = perl-(5\.10\.\d+)\.tar\.gz + url = http://www.cpan.org/src/ + regex = perl-(5\.(?:[02468]|1[02468])\.\d+)\.tar\.gz } %prep @@ -119,7 +115,6 @@ %{l_make} %{l_mflags} -f Makefile %install - rm -rf $RPM_BUILD_ROOT # install the Perl package via standard procedure %{l_make} %{l_mflags} -f Makefile install DESTDIR=$RPM_BUILD_ROOT @@ -185,12 +180,17 @@ # resolve file conflicts (with perl-locale) rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/enc2xs \ - $RPM_BUILD_ROOT%{l_prefix}/bin/piconv + $RPM_BUILD_ROOT%{l_prefix}/bin/piconv \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/enc2xs.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/piconv.1 # resolve file conflicts (with perl-module) rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/corelist \ $RPM_BUILD_ROOT%{l_prefix}/bin/config_data \ - $RPM_BUILD_ROOT%{l_prefix}/man/man1/config_data.1 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/config_data.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/corelist.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/cpan.1 \ + $RPM_BUILD_ROOT%{l_prefix}/man/man1/instmodsh.1 # resolve file conflicts (with perl-sys) rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/ptar \ @@ -208,5 +208,4 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT