- updated to 5.20.0, NFY

diff --git a/perl-modules b/perl-modules
index dd7d206af7fe94dfde2e9aa2e8d0d5a933be5ead..167972090b3c448328e1620424c3d9f1cc6642d9 100644 (file)
--- a/perl-modules
+++ b/perl-modules
@@ -1,85 +1,82 @@
-# Module versions from Perl 5.18.2 distribution.
-Archive::Tar = 1.90
-Attribute::Handlers = 0.94
-CGI = 3.63
-CPAN = 2.00
-CPAN::Meta = 2.120921
-CPAN::Meta::YAML = 0.008
-Compress::Raw::Bzip2 = 2.060
-Compress::Raw::Zlib = 2.060
-Devel::PPPort = 3.20
-Devel::Peek = 1.11
+# Module versions from Perl 5.20.0 distribution.
+Archive::Tar = 1.96
+Attribute::Handlers = 0.96
+CGI = 3.65
+CPAN = 2.05
+CPAN::Meta = 2.140640
+CPAN::Meta::YAML = 0.012
+Compress::Raw::Bzip2 = 2.064
+Compress::Raw::Zlib = 2.065
+Devel::PPPort = 3.21
+Devel::Peek = 1.16
 Digest = 1.17
-Digest::MD5 = 2.52
-Digest::SHA = 5.84_01
-Encode = 2.49
-ExtUtils::CBuilder = 0.280210
-ExtUtils::Command = 1.17
-ExtUtils::Embed = 1.30
-ExtUtils::Install = 1.59
-ExtUtils::MakeMaker = 6.66
+Digest::MD5 = 2.53
+Digest::SHA = 5.88
+Encode = 2.60
+ExtUtils::CBuilder = 0.280216
+ExtUtils::Command = 1.18
+ExtUtils::Embed = 1.32
+ExtUtils::Install = 1.67
+ExtUtils::MakeMaker = 6.98
 ExtUtils::Manifest = 1.63
-ExtUtils::ParseXS = 3.18
+ExtUtils::ParseXS = 3.24
 File::Compare = 1.1006
-File::Temp = 0.23
-Filter::Simple = 0.89
+File::Temp = 0.2304
+Filter::Simple = 0.91
 FindBin = 1.51
 GDBM_File = 1.15
 Hash::Util = 0.16
-I18N::LangTags = 0.39
-IO = 1.28
+I18N::LangTags = 0.40
+IO = 1.31
 IO::Zlib = 1.10
-IPC::Cmd = 0.80
-IPC::SysV = 2.03
-JSON::PP = 2.27202
-Locale::Codes = 3.25
-Locale::Maketext = 1.23
+IPC::Cmd = 0.92
+IPC::SysV = 2.04
+JSON::PP = 2.27203
+Locale::Codes = 3.30
+Locale::Maketext = 1.25
 Locale::Maketext::Simple = 0.21
-MIME::Base64 = 3.13
-Math::BigInt = 1.9991
-Math::BigInt::FastCalc = 0.30
-Math::BigRat = 0.2604
+MIME::Base64 = 3.14
+Math::BigInt = 1.9993
+Math::BigInt::FastCalc = 0.31
+Math::BigRat = 0.2606
 Math::Complex = 1.59
 Math::Trig = 1.23
 Memoize = 1.03
-Module::Build = 0.4003
-Module::CoreList = 3.03
-Module::Load = 0.24
-Module::Load::Conditional = 0.54
-Module::Metadata = 1.000011
-Module::Pluggable = 4.7
+Module::Build = 0.4205
+Module::CoreList = 3.11
+Module::Load = 0.32
+Module::Load::Conditional = 0.62
+Module::Metadata = 1.000019
 NEXT = 0.65
-Package::Constants = 0.02
-Params::Check = 0.36
-Parse::CPAN::Meta = 1.4404
-Perl::OSType = 1.003
+Package::Constants = 0.04
+Params::Check = 0.38
+Parse::CPAN::Meta = 1.4414
+Perl::OSType = 1.007
 PerlIO::via::QuotedPrint = 0.07
-Pod::Escapes = 1.04
-Pod::LaTeX = 0.61
-Pod::Parser = 1.60
+Pod::Escapes = 1.06
+Pod::Parser = 1.62
 Pod::Simple = 3.28
-Safe = 2.35
-Socket = 2.009
-Storable = 2.41
-Sys::Syslog = 0.32
+Safe = 2.37
+Socket = 2.013
+Storable = 2.49
+Sys::Syslog = 0.33
 Term::ANSIColor = 4.02
-Term::Cap = 1.13
+Term::Cap = 1.15
 Test = 1.26
-Test::Harness = 3.26
-Test::Simple = 0.98
+Test::Harness = 3.30
+Test::Simple = 1.001002
 Text::Balanced = 2.02
-Text::ParseWords = 3.28
-Text::Soundex = 3.04
-Text::Tabs = 2012.0818
-Tie::File = 0.99
+Text::ParseWords = 3.29
+Text::Tabs = 2013.0523
+Tie::File = 1.00
 Tie::RefHash = 1.39
-Time::HiRes = 1.9725
-Time::Piece = 1.20_01
+Time::HiRes = 1.9726
+Time::Piece = 1.27
 UNIVERSAL = 1.11
-Unicode::Collate = 0.97
-Unicode::Normalize = 1.16
-autodie = 2.13
-bignum = 0.33
-libnet = 1.22
-parent = 0.225
-version = 0.9902
+Unicode::Collate = 1.04
+Unicode::Normalize = 1.17
+autodie = 2.23
+bignum = 0.37
+libnet = 1.25
+parent = 0.228
+version = 0.9908

diff --git a/perl-modules2 b/perl-modules2
index 25936116de1efe1d3cb5f6175816a287fc75e715..990c27f58d6fb2a5b0563174fe25a8e81b36d7a5 100644 (file)
--- a/perl-modules2
+++ b/perl-modules2
@@ -1,4 +1,4 @@
-# Non-straight named module versions from Perl 5.18.2 distribution.
-IO-Compress    IO::Compress::Base = 2.060
-PathTools      File::Spec = 3.40
-Scalar-List-Utils      List::Util = 1.27
+# Non-straight named module versions from Perl 5.20.0 distribution.
+IO-Compress    IO::Compress::Base = 2.064
+PathTools      File::Spec = 3.47
+Scalar-List-Utils      List::Util = 1.38

diff --git a/perl.spec b/perl.spec
index a8cd80b033e3fab2ec02af21524775b8d4e6d2d4..afeda577c3f8ae9dc74e86b76d99dcee0633cb1f 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -24,9 +24,9 @@
 # - change all "R/BR: perl" to one of perl-{base,modules,devel}
 #
 # NOTE
-# - modules in 5.18.0: http://search.cpan.org/~rjbs/perl-5.18.0/
+# - modules in 5.20.0: http://search.cpan.org/~rjbs/perl-5.20.0/
 
-%define                abi     5.18.0
+%define                abi     5.20.0
 %define                perlthread      %{?with_threads:-thread-multi}
 
 %define                perl_privlib    %{_datadir}/perl5/%{ver}
@@ -44,8 +44,8 @@
 %define                perl_mod2verrel()       %([ -f %{SOURCE4} ] && awk -vp=%1 -vr=%2 '$1 == p { print $4"-"r }' %{SOURCE4} || echo ERROR)
 %define                perl_mod2version()      %([ -f %{SOURCE4} ] && awk -vp=%1 '$1 == p { m=$2; printf("perl-%s = %s\\n", p, $4)}END{if (!m) printf("# Error looking up [%s]\\n", p) }' %{SOURCE4} || echo ERROR)
 
-%define                ver     5.18.2
-%define                rel     1
+%define                ver     5.20.0
+%define                rel     0.1
 Summary:       Practical Extraction and Report Language (Perl)
 Summary(cs.UTF-8):     Programovací jazyk Perl
 Summary(da.UTF-8):     Programmeringssproget Perl
@@ -74,7 +74,7 @@ Epoch:                1
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/src/5.0/%{name}-%{ver}.tar.gz
-# Source0-md5: 373f57ccc441dbc1812435f45ad20660
+# Source0-md5: 406ec049ebe3afcc80d9c76ec78ca4f8
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db
 Source2:       %{name}.prov
@@ -447,14 +447,12 @@ Provides: %perl_modversion Module::CoreList
 Provides:      %perl_modversion Module::Load
 Provides:      %perl_modversion Module::Load::Conditional
 Provides:      %perl_modversion Module::Metadata
-Provides:      %perl_modversion Module::Pluggable
 Provides:      %perl_modversion NEXT
 Provides:      %perl_modversion Package::Constants
 Provides:      %perl_modversion Params::Check
 Provides:      %perl_modversion Parse::CPAN::Meta
 Provides:      %perl_modversion Perl::OSType
 Provides:      %perl_modversion Pod::Escapes
-Provides:      %perl_modversion Pod::LaTeX
 Provides:      %perl_modversion Pod::Parser
 Provides:      %perl_modversion Pod::Simple
 Provides:      %perl_modversion Safe
@@ -467,7 +465,6 @@ Provides:   %perl_modversion Test::Harness
 Provides:      %perl_modversion Test::Simple
 Provides:      %perl_modversion Text::Balanced
 Provides:      %perl_modversion Text::ParseWords
-Provides:      %perl_modversion Text::Soundex
 Provides:      %perl_modversion Time::HiRes
 Provides:      %perl_modversion Time::Piece
 Provides:      %perl_modversion UNIVERSAL
@@ -503,14 +500,12 @@ Obsoletes:        perl-Module-CoreList < %perl_modverrel Module::CoreList 99
 Obsoletes:     perl-Module-Load < %perl_modverrel Module::Load 99
 Obsoletes:     perl-Module-Load-Conditional < %perl_modverrel Module::Load::Conditional 99
 Obsoletes:     perl-Module-Metadata < %perl_modverrel Module::Metadata 99
-Obsoletes:     perl-Module-Pluggable < %perl_modverrel Module::Pluggable 99
 Obsoletes:     perl-NEXT < %perl_modverrel NEXT 99
 Obsoletes:     perl-Package-Constants < %perl_modverrel Package::Constants 99
 Obsoletes:     perl-Params::Check < %perl_modverrel Params::Check 99
 Obsoletes:     perl-Parse-CPAN-Meta < %perl_modverrel Parse::CPAN::Meta 99
 Obsoletes:     perl-Perl-OSType < %perl_modverrel Perl::OSType 99
 Obsoletes:     perl-Pod-Escapes < %perl_modverrel Pod::Escapes 99
-Obsoletes:     perl-Pod-LaTeX < %perl_modverrel Pod::LaTeX 99
 Obsoletes:     perl-Pod-Parser < %perl_modverrel Pod::Parser 99
 Obsoletes:     perl-Pod-Simple < %perl_modverrel Pod::Simple 99
 Obsoletes:     perl-Safe < %perl_modverrel Safe 99
@@ -524,7 +519,6 @@ Obsoletes:  perl-Test-Harness < %perl_modverrel Test::Harness 99
 Obsoletes:     perl-Test-Simple < %perl_modverrel Test::Simple 99
 Obsoletes:     perl-Text-Balanced < %perl_modverrel Text::Balanced 99
 Obsoletes:     perl-Text-ParseWords < %perl_modverrel Text::ParseWords 99
-Obsoletes:     perl-Text-Soundex < %perl_modverrel Text::Soundex 99
 Obsoletes:     perl-Time-HiRes < %perl_modverrel Time::HiRes 99
 Obsoletes:     perl-Time-Piece < %perl_modverrel Time::Piece 99
 Obsoletes:     perl-UNIVERSAL < %perl_modverrel UNIVERSAL 99
@@ -850,7 +844,7 @@ WANTED='
 cd "$owd"
 
 ## remove man pages for other operating systems
-%{__rm}        $RPM_BUILD_ROOT%{_mandir}/man1/perl{aix,amiga,bs2000,ce,cygwin,dgux,dos}* \
+%{__rm}        $RPM_BUILD_ROOT%{_mandir}/man1/perl{aix,amiga,bs2000,ce,cygwin,dos}* \
        $RPM_BUILD_ROOT%{_mandir}/man1/perl{freebsd,hpux,macos,os2,os390}* \
        $RPM_BUILD_ROOT%{_mandir}/man1/perl{qnx,solaris,vms,vos,win32}*
 
@@ -909,7 +903,7 @@ echo '# Module versions from Perl %{ver} distribution.' > perl-modules
 for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do
        case $m in
        libnet)
-               v=$(awk '/^libnet /{print $2; exit}' cpan/libnet/Changes)
+               v=$(awk '/VERSION/ {print $3; exit}' cpan/libnet/Makefile.PL | tr -d \',)
                ;;
        # special cased since do eval on VERSION
        ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib)
@@ -947,7 +941,7 @@ if ! cmp -s %{SOURCE4} perl-modules2; then
 fi
 
 # remove empty .bs files
-find $RPM_BUILD_ROOT -name \*.bs -size 0 -print0 | xargs -0 %{__rm}
+#find $RPM_BUILD_ROOT -name \*.bs -size 0 -print0 | xargs -0 %{__rm}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -1310,7 +1304,6 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_archlib}/auto/Compress/Raw
 %dir %{perl_archlib}/auto/Compress/Raw/*/
 %attr(755,root,root) %{perl_archlib}/auto/Compress/Raw/*/*.so
-%{perl_archlib}/auto/Compress/Raw/*/*.ix
 %{_mandir}/man3/Compress*
 
 %{perl_archlib}/Data
@@ -1396,12 +1389,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{perl_archlib}/auto/Sys/*/*.so
 %{_mandir}/man3/Sys::*
 
-%{perl_archlib}/Text
-%dir %{perl_archlib}/auto/Text
-%dir %{perl_archlib}/auto/Text/Soundex
-%attr(755,root,root) %{perl_archlib}/auto/Text/Soundex/*.so
-#%{_mandir}/man3/Text::Soundex*        # listed later
-
 %{perl_privlib}/Time
 %{perl_archlib}/Time
 %dir %{perl_archlib}/auto/Time
@@ -1445,8 +1432,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/FindBin.*
 %{perl_privlib}/JSON
 %{_mandir}/man3/JSON*
-%{perl_privlib}/Log
-%{_mandir}/man3/Log::*
 %{perl_privlib}/Locale
 %{_mandir}/man3/Locale::*
 %{perl_privlib}/Memoize*
@@ -1461,8 +1446,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_privlib}/Net/*.pm
 %{perl_privlib}/Net/FTP
 %{_mandir}/man3/Net::*
-%{perl_privlib}/Object
-%{_mandir}/man3/Object::*
 %{perl_privlib}/Package
 %{_mandir}/man3/Package::*
 %{perl_privlib}/Params

diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch
index e3c83c96e042f705b87a4f1a7bccd271e538bc4c..9123edc1c1e997b01f0ee100b411797ca0c5ddf2 100644 (file)
--- a/perl_585-microperl_uconfig.patch
+++ b/perl_585-microperl_uconfig.patch
@@ -4,8 +4,8 @@
  afsroot='/afs'
  alignbytes='4'
  aphostname='/bin/hostname'
--archlib='/usr/local/lib/perl5/5.18/unknown'
--archlibexp='/usr/local/lib/perl5/5.18/unknown'
+-archlib='/usr/local/lib/perl5/5.20/unknown'
+-archlibexp='/usr/local/lib/perl5/5.20/unknown'
 -archname='unknown'
  asctime_r_proto='0'
 -bin='/usr/local/bin'
@@ -42,8 +42,8 @@
  perl_static_inline='static'
  phostname='hostname'
  pidtype=int
--privlib='/usr/local/lib/perl5/5.18'
--privlibexp='/usr/local/lib/perl5/5.18'
+-privlib='/usr/local/lib/perl5/5.20'
+-privlibexp='/usr/local/lib/perl5/5.20'
  procselfexe=''
  prototype='undef'
 @@ -700,8 +691,6 @@
@@ -52,7 +52,7 @@
  sched_yield='sched_yield()'
 -scriptdir='/usr/local/bin'
 -scriptdirexp='/usr/local/bin'
- seedfunc='srand'
+ seedfunc='Perl_drand48_init'
  selectminbits='32'
  selecttype=int
 --- p/uconfig.h~       2012-08-03 19:35:26.000000000 +0200
@@ -60,7 +60,7 @@
 @@ -4735,5 +4735,5 @@
  
  /* Generated from:
-  * 2c9dc3f21d37b1665f6a59dfc6d79e6cb08bdf36a9c3e427d11d6b9ddffe2439 config_h.SH
-- * 26ab9b4aa382d32761cb91084ba59e7e4b190799502a43366ccb3d2f584783ca uconfig.sh
-+ * c1284f07832b8806da2457d27463e177f35a407920d144abb1a8533f5b7cd3b9 uconfig.sh
+  * 986d2349e078df67f02d5b9747b7fe65abb0d2875fb52a836138919aafe08545 config_h.SH
+- * dbc8d38ba52ae23e5423418bb3f56b1b6fcdaa82cf71ba0be3463e8221bfe0c0 uconfig.sh
++ * 47373608dbea89e81d56c421bde0da0969b5d7183ddff09ec5f65ab952ddc6cc uconfig.sh
   * ex: set ro: */