1.1 --- a/perl/perl.spec Thu Aug 09 19:02:16 2012 +0200 1.2 +++ b/perl/perl.spec Thu Aug 09 19:04:25 2012 +0200 1.3 @@ -1,6 +1,6 @@ 1.4 ## 1.5 ## perl.spec -- OpenPKG RPM Package Specification 1.6 -## Copyright (c) 2000-2011 OpenPKG Foundation e.V. <http://openpkg.net/> 1.7 +## Copyright (c) 2000-2012 OpenPKG Foundation e.V. <http://openpkg.net/> 1.8 ## 1.9 ## Permission to use, copy, modify, and distribute this software for 1.10 ## any purpose with or without fee is hereby granted, provided that 1.11 @@ -31,20 +31,16 @@ 1.12 Class: CORE 1.13 Group: Perl 1.14 License: GPL/Artistic 1.15 -Version: 5.14.1 1.16 -Release: 20110914 1.17 +Version: 5.16.0 1.18 +Release: 20120712 1.19 1.20 # list of sources 1.21 Source0: http://www.cpan.org/src/perl-%{version}.tar.gz 1.22 Patch0: perl.patch 1.23 1.24 # build information 1.25 -Prefix: %{l_prefix} 1.26 -BuildRoot: %{l_buildroot} 1.27 -BuildPreReq: OpenPKG, openpkg >= 20060823, gcc 1.28 -PreReq: OpenPKG, openpkg >= 20060823 1.29 -AutoReq: no 1.30 -AutoReqProv: no 1.31 +BuildPreReq: OpenPKG, openpkg >= 20100101, gcc 1.32 +PreReq: OpenPKG, openpkg >= 20100101 1.33 1.34 %description 1.35 Perl ("Practical Reporting and Extraction Language") is a very 1.36 @@ -119,8 +115,6 @@ 1.37 %{l_make} %{l_mflags} -f Makefile 1.38 1.39 %install 1.40 - # remove build cruft 1.41 - rm -rf $RPM_BUILD_ROOT 1.42 1.43 # install the Perl package via standard procedure 1.44 %{l_make} %{l_mflags} -f Makefile install DESTDIR=$RPM_BUILD_ROOT 1.45 @@ -201,18 +195,23 @@ 1.46 # resolve file conflicts (with perl-sys) 1.47 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/ptar \ 1.48 $RPM_BUILD_ROOT%{l_prefix}/bin/ptardiff \ 1.49 + $RPM_BUILD_ROOT%{l_prefix}/bin/ptargrep \ 1.50 $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptar.1 \ 1.51 - $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 1.52 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptardiff.1 \ 1.53 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/ptargrep.1 1.54 1.55 # resolve file conflicts (with perl-crypto) 1.56 rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/shasum \ 1.57 $RPM_BUILD_ROOT%{l_prefix}/man/man1/shasum.1 1.58 1.59 + # resolve file conflicts (with perl-comp) 1.60 + rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/zipdetails \ 1.61 + $RPM_BUILD_ROOT%{l_prefix}/man/man1/zipdetails.1 1.62 + 1.63 # determine installed files 1.64 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} 1.65 1.66 %files -f files 1.67 1.68 %clean 1.69 - rm -rf $RPM_BUILD_ROOT 1.70