-base requires Scalar/Util.pm for File/Temp.pm

[packages/perl.git] / perl.spec

diff --git a/perl.spec b/perl.spec
index 43522a4c5ba25b313b9e2c7b0d49e9bb9d4151e1..5cf24057ca91c6ecc26aac5327e399df2b710b37 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -25,7 +25,7 @@
 # NOTE
 # - modules in 5.20.0: http://search.cpan.org/~rjbs/perl-5.20.0/
 
-%define                abi     5.24.0
+%define                abi     5.26.0
 %define                perlthread      %{?with_threads:-thread-multi}
 
 %define                perl_privlib    %{_datadir}/perl5/%{ver}
@@ -43,8 +43,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.24.1
-%define                rel     1
+%define                ver     5.26.0
+%define                rel     4
 Summary:       Practical Extraction and Report Language (Perl)
 Summary(cs.UTF-8):     Programovací jazyk Perl
 Summary(da.UTF-8):     Programmeringssproget Perl
@@ -72,8 +72,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.bz2
-# Source0-md5: 178ee0e8fa544dbc76d99cf041e2c9f0
+Source0:       http://www.cpan.org/src/5.0/%{name}-%{ver}.tar.xz
+# Source0-md5: 8c6995718e4cb62188f0d5e3488cd91f
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db
 Source2:       %{name}.prov
@@ -90,7 +90,6 @@ Patch5:               %{name}_585-microperl_uconfig.patch
 Patch6:                %{name}-write-permissions.patch
 Patch7:                %{name}-t-syslog.patch
 Patch8:                %{name}-Destroy-GDBM-NDBM-ODBM-SDBM-_File-objects.patch
-Patch9:                %{name}-switch.patch
 Patch10:       %{name}-invalid-void-use.patch
 Patch11:       %{name}-test-dst.patch
 URL:           http://dev.perl.org/perl5/
@@ -307,6 +306,7 @@ Group:              Development/Languages/Perl
 Requires:      %{name}-libs = %{epoch}:%{ver}-%{release}
 Requires:      %{perl_vendorarch}
 Requires:      %{perl_vendorlib}
+Requires:      perl(Scalar::Util)
 Provides:      perl(largefiles)
 Provides:      %perl_mod2version IO-Compress
 Provides:      %perl_mod2version PathTools
@@ -315,6 +315,7 @@ Provides:   %perl_modversion File::Temp
 Provides:      %perl_modversion IO
 Provides:      %perl_modversion IO::Zlib
 Provides:      %perl_modversion IPC::Cmd
+Provides:      %perl_modversion Perl::OSType
 Provides:      %perl_modversion PerlIO::via::QuotedPrint
 Provides:      %perl_modversion Socket
 Provides:      %perl_modversion Tie::File
@@ -327,6 +328,7 @@ Obsoletes:  perl-IO-Compress < %perl_mod2verrel IO-Compress 99
 Obsoletes:     perl-IO-Zlib < %perl_modverrel IO::Zlib 99
 Obsoletes:     perl-IPC-Cmd < %perl_modverrel IPC::Cmd 99
 Obsoletes:     perl-PathTools < %perl_mod2verrel PathTools 99
+Obsoletes:     perl-Perl-OSType < %perl_modverrel Perl::OSType 99
 Obsoletes:     perl-PerlIO-via-QuotedPrint < %perl_modverrel PerlIO::via::QuotedPrint 99
 Obsoletes:     perl-Socket < %perl_modverrel Socket 99
 Obsoletes:     perl-Tie-File < %perl_modverrel Tie::File 99
@@ -425,6 +427,7 @@ Provides:   %perl_modversion Archive::Tar
 Provides:      %perl_modversion Attribute::Handlers
 Provides:      %perl_modversion Compress::Raw::Bzip2
 Provides:      %perl_modversion Compress::Raw::Zlib
+Provides:      %perl_modversion Compress::Zlib
 Provides:      %perl_modversion Digest
 Provides:      %perl_modversion Digest::MD5
 Provides:      %perl_modversion Digest::SHA
@@ -450,7 +453,6 @@ Provides:   %perl_modversion Module::Metadata
 Provides:      %perl_modversion NEXT
 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::Parser
 Provides:      %perl_modversion Pod::Simple
@@ -479,6 +481,7 @@ Obsoletes:  perl-Archive-Tar < %perl_modverrel Archive::Tar 99
 Obsoletes:     perl-Attribute-Handlers < %perl_modverrel Attribute::Handlers 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-Compress-Zlib < %perl_modverrel Compress::Zlib 99
 Obsoletes:     perl-Digest < %perl_modverrel Digest 99
 Obsoletes:     perl-Digest-MD5 < %perl_modverrel Digest::MD5 99
 Obsoletes:     perl-Digest-SHA < %perl_modverrel Digest::SHA 99
@@ -504,7 +507,6 @@ Obsoletes:  perl-Module-Metadata < %perl_modverrel Module::Metadata 99
 Obsoletes:     perl-NEXT < %perl_modverrel NEXT 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-Parser < %perl_modverrel Pod::Parser 99
 Obsoletes:     perl-Pod-Simple < %perl_modverrel Pod::Simple 99
@@ -585,7 +587,6 @@ Requires:   %{name}-devel = %{epoch}:%{ver}-%{release}
 
 %description tools-devel
 Various tools from the core Perl distribution:
-c2ph, pstruct  - Dump C structures as generated from C<cc -g -S> stabs
 h2ph           - convert .h C header files to .ph Perl header files
 h2xs           - convert .h C header files to Perl extensions
 perlivp                - Perl Installation Verification Procedure
@@ -594,8 +595,6 @@ splain              - force verbose warning diagnostics
 
 %description tools-devel -l pl.UTF-8
 Różne narzędzia z podstawowej dystrybucji Perla:
-c2ph, pstruct  - zrzucanie struktur C w postaci generowanej z tablic
-                 symboli z cc -g -S
 h2ph           - konwerter plików nagłówkowych .h z C na perlowe pliki
                  nagłówkowe .ph
 h2xs           - konwerter plików nagłówkowych .h z C na rozszerzenia
@@ -727,7 +726,6 @@ zbyt duża, a rozmiar za mały na tworzenie oddzielnych rozszerzeń.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
 %patch11 -p1
 
@@ -816,7 +814,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
 
 ## install directory needed by packages dependant on TAP::Harness
 install -d $RPM_BUILD_ROOT%{perl_privlib}/TAP/Harness
@@ -1540,6 +1537,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Fatal.3perl*
 %{perl_privlib}/FindBin.pm
 %{_mandir}/man3/FindBin.3perl*
+%{_mandir}/man3/Internals.3perl*
 %{perl_privlib}/JSON
 %{_mandir}/man3/JSON::PP*.3perl*
 %{perl_privlib}/Locale
@@ -1632,6 +1630,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Term::Cap.3perl*
 %{_mandir}/man3/Term::Complete.3perl*
 %{_mandir}/man3/Term::ReadLine.3perl*
+
 %{perl_privlib}/Test.pm
 %{perl_privlib}/Test
 %{_mandir}/man3/Test.3perl*
@@ -1642,6 +1641,19 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Test::Tester*.3perl*
 %{_mandir}/man3/Test::Tutorial.3perl*
 %{_mandir}/man3/Test::use::ok.3perl*
+
+%{perl_privlib}/Test2.pm
+%{perl_privlib}/Test2
+%{_mandir}/man3/Test2.3perl*
+%{_mandir}/man3/Test2::API*.3perl*
+%{_mandir}/man3/Test2::Event*.3perl*
+%{_mandir}/man3/Test2::Formatter*.3perl*
+%{_mandir}/man3/Test2::Hub*.3perl*
+%{_mandir}/man3/Test2::IPC*.3perl*
+%{_mandir}/man3/Test2::Tools::Tiny.3perl*
+%{_mandir}/man3/Test2::Transition.3perl*
+%{_mandir}/man3/Test2::Util*.3perl*
+
 %{perl_privlib}/Text
 %{_mandir}/man3/Text::Abbrev.3perl*
 %{_mandir}/man3/Text::Balanced.3perl*
@@ -1694,10 +1706,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/perlbug
 %{_mandir}/man1/perlbug.1*
-%attr(755,root,root) %{_bindir}/c2ph
-%attr(755,root,root) %{_bindir}/pstruct
-%{_mandir}/man1/c2ph.1*
-%{_mandir}/man1/pstruct.1*
 %attr(755,root,root) %{_bindir}/h2ph
 %{_mandir}/man1/h2ph.1*
 %attr(755,root,root) %{_bindir}/h2xs