- up to 5.22.0

diff --git a/perl-modules b/perl-modules
index c68069f252639519b20af2f8098d09342468e814..60e8f440a4d78cd20ae7e98417adebf1cf210a3b 100644 (file)
--- a/perl-modules
+++ b/perl-modules
@@ -1,82 +1,81 @@
-# Module versions from Perl 5.20.3 distribution.
-Archive::Tar = 1.96
-Attribute::Handlers = 0.96
-CGI = 3.65
-CPAN = 2.05
-CPAN::Meta = 2.140640
+# Module versions from Perl 5.22.0 distribution.
+Archive::Tar = 2.04
+Attribute::Handlers = 0.97
+CGI = 4.21
+CPAN = 2.11
+CPAN::Meta = 2.150001
 CPAN::Meta::YAML = 0.012
-Compress::Raw::Bzip2 = 2.064
-Compress::Raw::Zlib = 2.065
-Devel::PPPort = 3.21
-Devel::Peek = 1.16
+Compress::Raw::Bzip2 = 2.068
+Compress::Raw::Zlib = 2.068
+Devel::PPPort = 3.31
+Devel::Peek = 1.22
 Digest = 1.17
-Digest::MD5 = 2.53
-Digest::SHA = 5.88
-Encode = 2.60
-ExtUtils::CBuilder = 0.280217
-ExtUtils::Command = 1.18
+Digest::MD5 = 2.54
+Digest::SHA = 5.95
+Encode = 2.72
+ExtUtils::CBuilder = 0.280221
+ExtUtils::Command = 1.20
 ExtUtils::Embed = 1.32
-ExtUtils::Install = 1.67
-ExtUtils::MakeMaker = 6.98
-ExtUtils::Manifest = 1.63
-ExtUtils::ParseXS = 3.24
+ExtUtils::Install = 2.04
+ExtUtils::MakeMaker = 7.0401
+ExtUtils::Manifest = 1.70
+ExtUtils::ParseXS = 3.28
 File::Compare = 1.1006
 File::Temp = 0.2304
-Filter::Simple = 0.91
+Filter::Simple = 0.92
 FindBin = 1.51
 GDBM_File = 1.15
-Hash::Util = 0.16
+Hash::Util = 0.18
 I18N::LangTags = 0.40
-IO = 1.31
+IO = 1.35
 IO::Zlib = 1.10
 IPC::Cmd = 0.92
 IPC::SysV = 2.04
-JSON::PP = 2.27203
-Locale::Codes = 3.30
-Locale::Maketext = 1.25
+JSON::PP = 2.27300
+Locale::Codes = 3.34
+Locale::Maketext = 1.26
 Locale::Maketext::Simple = 0.21
-MIME::Base64 = 3.14
-Math::BigInt = 1.9993
+MIME::Base64 = 3.15
+Math::BigInt = 1.9997
 Math::BigInt::FastCalc = 0.31
-Math::BigRat = 0.2606
+Math::BigRat = 0.2608
 Math::Complex = 1.59
 Math::Trig = 1.23
 Memoize = 1.03
-Module::Build = 0.4205
-Module::CoreList = 5.20150822
+Module::Build = 0.421
+Module::CoreList = 5.20150520
 Module::Load = 0.32
-Module::Load::Conditional = 0.62
-Module::Metadata = 1.000019
+Module::Load::Conditional = 0.64
+Module::Metadata = 1.000026
 NEXT = 0.65
-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.06
-Pod::Parser = 1.62
-Pod::Simple = 3.28
-Safe = 2.37
-Socket = 2.013
-Storable = 2.49_01
+Perl::OSType = 1.008
+PerlIO::via::QuotedPrint = 0.08
+Pod::Escapes = 1.07
+Pod::Parser = 1.63
+Pod::Simple = 3.29
+Safe = 2.39
+Socket = 2.018
+Storable = 2.53
 Sys::Syslog = 0.33
-Term::ANSIColor = 4.02
+Term::ANSIColor = 4.03
 Term::Cap = 1.15
 Test = 1.26
-Test::Harness = 3.30
-Test::Simple = 1.001002
-Text::Balanced = 2.02
-Text::ParseWords = 3.29
+Test::Harness = 3.35
+Test::Simple = 1.001014
+Text::Balanced = 2.03
+Text::ParseWords = 3.30
 Text::Tabs = 2013.0523
-Tie::File = 1.00
+Tie::File = 1.01
 Tie::RefHash = 1.39
 Time::HiRes = 1.9726
-Time::Piece = 1.27
-UNIVERSAL = 1.11
-Unicode::Collate = 1.04
-Unicode::Normalize = 1.17
-autodie = 2.23
-bignum = 0.37
-libnet = 1.25
-parent = 0.228
+Time::Piece = 1.29
+UNIVERSAL = 1.12
+Unicode::Collate = 1.12
+Unicode::Normalize = 1.18
+autodie = 2.26
+bignum = 0.39
+libnet = 3.05
+parent = 0.232
 version = 0.9909

diff --git a/perl-modules2 b/perl-modules2
index 052afcc897131b10f8a85b9af09eb44c6096a307..cf9c456aefc4ac2fe69cf22760de7c2b41001f07 100644 (file)
--- a/perl-modules2
+++ b/perl-modules2
@@ -1,4 +1,4 @@
-# Non-straight named module versions from Perl 5.20.3 distribution.
-IO-Compress    IO::Compress::Base = 2.064
-PathTools      File::Spec = 3.48_01
-Scalar-List-Utils      List::Util = 1.38
+# Non-straight named module versions from Perl 5.22.0 distribution.
+IO-Compress    IO::Compress::Base = 2.068
+PathTools      File::Spec = 3.56
+Scalar-List-Utils      List::Util = 1.41

diff --git a/perl-write-permissions.patch b/perl-write-permissions.patch
index 98f4eb47e99b2d8480bc1ba9d30b2b148038cdfb..760136ae58426b1ed2c922d57299d78ae0020381 100644 (file)
--- a/perl-write-permissions.patch
+++ b/perl-write-permissions.patch
@@ -1,5 +1,5 @@
---- perl-5.12.0/dist/ExtUtils-Install/lib/ExtUtils/Install.pm.orig     2009-08-03 21:36:03.000000000 +0200
-+++ perl-5.12.0/dist/ExtUtils-Install/lib/ExtUtils/Install.pm  2009-09-12 10:07:06.181527344 +0200
+--- perl-5.12.0/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm.orig     2009-08-03 21:36:03.000000000 +0200
++++ perl-5.12.0/cpan/ExtUtils-Install/lib/ExtUtils/Install.pm  2009-09-12 10:07:06.181527344 +0200
 @@ -813,7 +813,7 @@
                  utime($atime,$mtime + $Is_VMS,$targetfile) unless $dry_run>1;
  
@@ -18,8 +18,8 @@
          next unless $from =~ /\.pm$/;
          _autosplit($to,$autodir);
      }
---- perl-5.20.0/dist/ExtUtils-Install/t/Install.t.orig 2014-05-29 13:11:07.961096445 +0200
-+++ perl-5.20.0/dist/ExtUtils-Install/t/Install.t      2014-05-29 13:11:20.681234036 +0200
+--- perl-5.20.0/cpan/ExtUtils-Install/t/Install.t.orig 2014-05-29 13:11:07.961096445 +0200
++++ perl-5.20.0/cpan/ExtUtils-Install/t/Install.t      2014-05-29 13:11:20.681234036 +0200
 @@ -237,7 +237,7 @@
                           },
      ]);

diff --git a/perl.spec b/perl.spec
index 8b02d925f0cdb752ea7439bf48062eee59030d22..90952cbd89b8db245539de1c3d16a12346ef3ef1 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -26,7 +26,7 @@
 # NOTE
 # - modules in 5.20.0: http://search.cpan.org/~rjbs/perl-5.20.0/
 
-%define                abi     5.20.0
+%define                abi     5.22.0
 %define                perlthread      %{?with_threads:-thread-multi}
 
 %define                perl_privlib    %{_datadir}/perl5/%{ver}
@@ -44,7 +44,7 @@
 %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.20.3
+%define                ver     5.22.0
 %define                rel     1
 Summary:       Practical Extraction and Report Language (Perl)
 Summary(cs.UTF-8):     Programovací jazyk Perl
@@ -73,8 +73,8 @@ Release:      %{rel}%{!?with_threads:_nothr}
 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: d647d0ea5a7a8194c34759ab9f2610cd
+Source0:       http://www.cpan.org/src/5.0/%{name}-%{ver}.tar.xz
+# Source0-md5: ff0f09b17de426eff323426cb140ee79
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db
 Source2:       %{name}.prov
@@ -361,7 +361,6 @@ Provides:   %perl_modversion ExtUtils::Install
 Provides:      %perl_modversion ExtUtils::MakeMaker
 Provides:      %perl_modversion ExtUtils::Manifest
 Provides:      %perl_modversion ExtUtils::ParseXS
-Provides:      %perl_modversion Module::Build
 Obsoletes:     perl-CPAN < %perl_modverrel CPAN 99
 Obsoletes:     perl-CPAN-Meta < %perl_modverrel CPAN::Meta 99
 Obsoletes:     perl-CPAN-Meta-YAML < %perl_modverrel CPAN::Meta::YAML 99
@@ -374,7 +373,6 @@ Obsoletes:  perl-ExtUtils-Install < %perl_modverrel ExtUtils::Install 99
 Obsoletes:     perl-ExtUtils-MakeMaker < %perl_modverrel ExtUtils::MakeMaker 99
 Obsoletes:     perl-ExtUtils-Manifest < %perl_modverrel ExtUtils::Manifest 99
 Obsoletes:     perl-ExtUtils-ParseXS < %perl_modverrel ExtUtils::ParseXS 99
-Obsoletes:     perl-Module-Build < %perl_modverrel Module::Build 99
 Obsoletes:     perl-lib-devel
 
 %description devel
@@ -422,7 +420,6 @@ Suggests:   perl-Version-Requirements
 Provides:      %perl_mod2version Scalar-List-Utils
 Provides:      %perl_modversion Archive::Tar
 Provides:      %perl_modversion Attribute::Handlers
-Provides:      %perl_modversion CGI
 Provides:      %perl_modversion Compress::Raw::Bzip2
 Provides:      %perl_modversion Compress::Raw::Zlib
 Provides:      %perl_modversion Digest
@@ -448,7 +445,6 @@ Provides:   %perl_modversion Module::Load
 Provides:      %perl_modversion Module::Load::Conditional
 Provides:      %perl_modversion Module::Metadata
 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
@@ -475,7 +471,6 @@ Provides:   %perl_modversion libnet
 Provides:      %perl_modversion version
 Obsoletes:     perl-Archive-Tar < %perl_modverrel Archive::Tar 99
 Obsoletes:     perl-Attribute-Handlers < %perl_modverrel Attribute::Handlers 99
-Obsoletes:     perl-CGI < %perl_modverrel CGI 99
 Obsoletes:     perl-Compress-Raw-Bzip2 < %perl_modverrel Compress::Raw::Bzip2 99
 Obsoletes:     perl-Compress-Raw-Zlib < %perl_modverrel Compress::Raw::Zlib 99
 Obsoletes:     perl-Digest < %perl_modverrel Digest 99
@@ -501,7 +496,6 @@ 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-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
@@ -566,16 +560,12 @@ Requires: %{name}-devel = %{epoch}:%{ver}-%{release}
 
 %description tools
 Various tools from the core Perl distribution:
-a2p            - Awk to Perl translator
-find2perl      - translate find command lines to Perl code
-psed, s2p      - a stream editor
+encguess       - guess encodning
 and others.
 
 %description tools -l pl.UTF-8
 Różne narzędzia z podstawowej dystrybucji Perla:
-a2p            - translator skryptów Awka do Perla
-find2perl      - tłumaczenie linii poleceń programu find na kod w Perlu
-psed, s2p      - edytor strumieniowy
+encguess       - odgaduje kodowanie znaków
 i inne.
 
 %package tools-devel
@@ -801,7 +791,6 @@ install -d $RPM_BUILD_ROOT%{_mandir}/{ja,ko,zh_CN,zh_TW}/man1
 ## use symlinks instead of hardlinks
 %{__ln_s} -f perl%{ver}        $RPM_BUILD_ROOT%{_bindir}/perl
 %{__ln_s} -f c2ph      $RPM_BUILD_ROOT%{_bindir}/pstruct
-%{__ln_s} -f psed      $RPM_BUILD_ROOT%{_bindir}/s2p
 
 ## install directory needed by packages dependant on TAP::Harness
 install -d $RPM_BUILD_ROOT%{perl_privlib}/TAP/Harness
@@ -859,7 +848,6 @@ echo ".so perl%(echo %{ver} | tr -d .)delta.1" >$RPM_BUILD_ROOT%{_mandir}/man1/p
 
 ## We already have these *.pod files as man pages
 %{__rm} $RPM_BUILD_ROOT%{perl_privlib}/{Encode,Test,Net,Locale{,/Maketext},version}/*.pod
-%{__rm} $RPM_BUILD_ROOT%{perl_privlib}/pod/a2p.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_privlib}/*.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/*.pod
 
@@ -878,9 +866,6 @@ cp -p lib/unicore/{Blocks,CaseFolding,SpecialCasing}.txt $RPM_BUILD_ROOT%{perl_p
 # cpan tools, we use rpm instead of cpan for managing packages (some search tool would be nice to have but...)
 %{__rm} $RPM_BUILD_ROOT%{_bindir}/cpan*
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/cpan*
-# others
-%{__rm} $RPM_BUILD_ROOT%{_bindir}/config_data
-%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/config_data*
 
 owd=$(pwd)
 
@@ -1101,6 +1086,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{perl_archlib}/auto/Socket/*.so
 %{_mandir}/man3/Socket.*
 
+%dir %{perl_archlib}/Sub
+%{perl_archlib}/Sub/Util.pm
+%{_mandir}/man3/Sub::Util*
+
 %dir %{perl_archlib}/Tie
 %dir %{perl_archlib}/Tie/Hash
 %{perl_archlib}/Tie/Hash/NamedCapture.pm
@@ -1160,11 +1149,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_privlib}/DB.*
 %{_mandir}/man3/DB.*
 
-%{perl_privlib}/inc
-%{_mandir}/man3/inc::latest*
-%{perl_privlib}/Module/Build*
-%{_mandir}/man3/Module::Build*
-
 %{perl_archlib}/O.*
 %{_mandir}/man3/O.*
 
@@ -1239,6 +1223,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/less.*
 %{perl_privlib}/locale.pm
 %{_mandir}/man3/locale.*
+%{perl_privlib}/meta_notation.pm
+%{perl_privlib}/ok.pm
+%{_mandir}/man3/ok.*
 %{perl_privlib}/open.pm
 %{_mandir}/man3/open.*
 %{perl_privlib}/sigtrap.pm
@@ -1415,8 +1402,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Attribute*
 %{perl_privlib}/Benchmark*
 %{_mandir}/man3/Benchmark*
-%{perl_privlib}/CGI*
-%{_mandir}/man3/CGI*
 %{perl_privlib}/Config
 %{_mandir}/man3/Config::*
 %{perl_privlib}/DirHandle*
@@ -1445,8 +1430,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_privlib}/Net/*.pm
 %{perl_privlib}/Net/FTP
 %{_mandir}/man3/Net::*
-%{perl_privlib}/Package
-%{_mandir}/man3/Package::*
 %{perl_privlib}/Params
 %{_mandir}/man3/Params::*
 %{perl_privlib}/Parse
@@ -1493,28 +1476,22 @@ rm -rf $RPM_BUILD_ROOT
 
 %files tools
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/a2p
-%{_mandir}/man1/a2p.*
 %attr(755,root,root) %{_bindir}/corelist
 %{_mandir}/man1/corelist.*
-%attr(755,root,root) %{_bindir}/find2perl
-%{_mandir}/man1/find2perl.*
+%attr(755,root,root) %{_bindir}/encguess
+%{_mandir}/man1/encguess.*
 %attr(755,root,root) %{_bindir}/instmodsh
 %{_mandir}/man1/instmodsh.*
 %attr(755,root,root) %{_bindir}/json_pp
 %{_mandir}/man1/json_pp.*
 %attr(755,root,root) %{_bindir}/libnetcfg
 %{_mandir}/man1/libnetcfg.*
-%attr(755,root,root) %{_bindir}/psed
-%{_mandir}/man1/psed.*
 %attr(755,root,root) %{_bindir}/ptar
 %{_mandir}/man1/ptar.*
 %attr(755,root,root) %{_bindir}/ptargrep
 %{_mandir}/man1/ptargrep.*
 %attr(755,root,root) %{_bindir}/ptardiff
 %{_mandir}/man1/ptardiff.*
-%attr(755,root,root) %{_bindir}/s2p
-%{_mandir}/man1/s2p.*
 %attr(755,root,root) %{_bindir}/shasum
 %{_mandir}/man1/shasum.*
 %attr(755,root,root) %{_bindir}/zipdetails

diff --git a/perl_585-microperl_uconfig.patch b/perl_585-microperl_uconfig.patch
index 681d724b6c038e6994246fd07358363d17ec3b8d..9a42ed84ec2e8ed994605236acbc5d8a92c2c6aa 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.20/unknown'
--archlibexp='/usr/local/lib/perl5/5.20/unknown'
+-archlib='/usr/local/lib/perl5/5.22/unknown'
+-archlibexp='/usr/local/lib/perl5/5.22/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.20'
--privlibexp='/usr/local/lib/perl5/5.20'
+-privlib='/usr/local/lib/perl5/5.22'
+-privlibexp='/usr/local/lib/perl5/5.22'
  procselfexe=''
  prototype='undef'
 @@ -700,8 +691,6 @@
@@ -60,7 +60,7 @@
 @@ -4735,5 +4735,5 @@
  
  /* Generated from:
-  * 7557e985de18f71e80f627226b454bc8eaf20477dcf0c45b5b2c51ec792f5c89 config_h.SH
-- * dbc8d38ba52ae23e5423418bb3f56b1b6fcdaa82cf71ba0be3463e8221bfe0c0 uconfig.sh
-+ * 47373608dbea89e81d56c421bde0da0969b5d7183ddff09ec5f65ab952ddc6cc uconfig.sh
+  * 496e563499c7b715275d61ae663d25dd20d963c75f9d3ee7850dae949df14136 config_h.SH
+- * 45fb46f69ab3d7fd8ea14fc29d490d044cbdd81e8a0111bc0b37aff4321d6182 uconfig.sh
++ * ac1398cfcf711ffaa4e3d4f3a45cd4629da1d2a30a17c3a598e845faa9ce90c8 uconfig.sh
   * ex: set ro: */