runperl -MCGI would include system wide perl-CGI and we don't want that. PERL5LIB...

[packages/perl.git] / perl.spec

diff --git a/perl.spec b/perl.spec
index b7b4f86762b6790e5dbd87ca9aa81a0b8a5b9762..5927132f61c9541990738100496eca9832ce4159 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.26.0
+%define                abi     5.32.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.26.1
-%define                rel     3
+%define                ver     5.32.1
+%define                rel     1
 Summary:       Practical Extraction and Report Language (Perl)
 Summary(cs.UTF-8):     Programovací jazyk Perl
 Summary(da.UTF-8):     Programmeringssproget Perl
@@ -73,7 +73,7 @@ Epoch:                1
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/src/5.0/%{name}-%{ver}.tar.xz
-# Source0-md5: 70e988b4318739b0cf3ad5e120bfde88
+# Source0-md5: 7f104064b906ad8c7329ca5e409a32d7
 Source1:       http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
 # Source1-md5: de47d7893f49ad7f41ba69c78511c0db
 Source2:       %{name}.prov
@@ -84,14 +84,13 @@ Patch3:             %{name}_581-soname.patch
 Patch4:                %{name}-test-noproc.patch
 # Test regen.t checks result of this patch.
 # To run test manually run, from BUILD/perl-*:
-# LD_LIBRARY_PATH=$(pwd) ./preload ./libperl.so ./perl t/porting/regen.t
+# PERL5LIB=$(pwd) LD_LIBRARY_PATH=$(pwd) ./preload ./libperl.so ./perl t/porting/regen.t
 # Make sure sha output from test matches sha from uconfig.h
 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
 Patch10:       %{name}-invalid-void-use.patch
-Patch11:       %{name}-test-dst.patch
 URL:           http://dev.perl.org/perl5/
 %ifarch ppc
 # gcc 3.3.x miscompiles pp_hot.c
@@ -312,6 +311,7 @@ Provides:   %perl_mod2version IO-Compress
 Provides:      %perl_mod2version PathTools
 Provides:      %perl_modversion File::Compare
 Provides:      %perl_modversion File::Temp
+Provides:      %perl_modversion Getopt::Long
 Provides:      %perl_modversion IO
 Provides:      %perl_modversion IO::Zlib
 Provides:      %perl_modversion IPC::Cmd
@@ -421,7 +421,7 @@ Summary:    Modules from the core Perl distribution
 Summary(pl.UTF-8):     Moduły z podstawowej dystrybucji Perla
 Group:         Libraries
 Requires:      %{name}-base = %{epoch}:%{ver}-%{release}
-Suggests:      perl-Encode >= 1:2.44
+Requires:      perl-Encode >= 2:2.49-%{ver}.%{rel}
 Suggests:      perl-Version-Requirements
 Provides:      %perl_modversion Archive::Tar
 Provides:      %perl_modversion Attribute::Handlers
@@ -436,7 +436,6 @@ Provides:   %perl_modversion FindBin
 Provides:      %perl_modversion I18N::LangTags
 Provides:      %perl_modversion IPC::SysV
 Provides:      %perl_modversion JSON::PP
-Provides:      %perl_modversion Locale::Codes
 Provides:      %perl_modversion Locale::Maketext
 Provides:      %perl_modversion Locale::Maketext::Simple
 Provides:      %perl_modversion MIME::Base64
@@ -454,7 +453,6 @@ Provides:   %perl_modversion NEXT
 Provides:      %perl_modversion Params::Check
 Provides:      %perl_modversion Parse::CPAN::Meta
 Provides:      %perl_modversion Pod::Escapes
-Provides:      %perl_modversion Pod::Parser
 Provides:      %perl_modversion Pod::Simple
 Provides:      %perl_modversion Safe
 Provides:      %perl_modversion Storable
@@ -490,7 +488,6 @@ Obsoletes:  perl-FindBin < %perl_modverrel FindBin 99
 Obsoletes:     perl-I18N-LangTags < %perl_modverrel I18N::LangTags 99
 Obsoletes:     perl-IPC-SysV < %perl_modverrel IPC::SysV 99
 Obsoletes:     perl-JSON-PP < %perl_modverrel JSON::PP 99
-Obsoletes:     perl-Locale-Codes < %perl_modverrel Locale::Codes 99
 Obsoletes:     perl-Locale-Maketext < %perl_modverrel Locale::Maketext 99
 Obsoletes:     perl-Locale-Maketext-Simple < %perl_modverrel Locale::Maketext::Simple 99
 Obsoletes:     perl-MIME-Base64 < %perl_modverrel MIME::Base64 99
@@ -505,10 +502,9 @@ 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-Params::Check < %perl_modverrel Params::Check 99
+Obsoletes:     perl-Params-Check < %perl_modverrel Params::Check 99
 Obsoletes:     perl-Parse-CPAN-Meta < %perl_modverrel Parse::CPAN::Meta 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
 Obsoletes:     perl-Safe < %perl_modverrel Safe 99
 Obsoletes:     perl-Storable < %perl_modverrel Storable 99
@@ -727,13 +723,15 @@ zbyt duża, a rozmiar za mały na tworzenie oddzielnych rozszerzeń.
 %patch7 -p1
 %patch8 -p1
 %patch10 -p1
-%patch11 -p1
 
 cat > runperl <<'EOF'
 #!/bin/sh
+# Prevent any system paths from being used.
+# Note: you cant use runperl -MXYZ because BEGIN is executed after -M
 LD_PRELOAD="%{_builddir}/%{name}-%{ver}/libperl.so.%{abi}" \
 PERL5LIB="%{buildroot}%{perl_privlib}:%{buildroot}%{perl_archlib}" \
-exec %{buildroot}%{_bindir}/perl ${1:+"$@"}
+exec %{buildroot}%{_bindir}/perl -e 'BEGIN { @INC = ("%{buildroot}%{perl_privlib}", "%{buildroot}%{perl_archlib}"); }; if (@ARGV > 0) { do(shift(@ARGV)) or die "Error attempting to execute script: $@\n"; } ' \
+    ${1:+"$@"}
 EOF
 chmod a+x runperl
 
@@ -856,7 +854,7 @@ WANTED='
 cd "$owd"
 
 ## remove man pages for other operating systems
-%{__rm}        $RPM_BUILD_ROOT%{_mandir}/man1/perl{aix,amiga,bs2000,ce,cygwin,dos}* \
+%{__rm}        $RPM_BUILD_ROOT%{_mandir}/man1/perl{aix,amiga,bs2000,cygwin,dos}* \
        $RPM_BUILD_ROOT%{_mandir}/man1/perl{freebsd,hpux,macos,os2,os390}* \
        $RPM_BUILD_ROOT%{_mandir}/man1/perl{qnx,solaris,vms,vos,win32}*
 
@@ -870,10 +868,14 @@ echo ".so perl%(echo %{ver} | tr -d .)delta.1" >$RPM_BUILD_ROOT%{_mandir}/man1/p
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/File::Spec::{Epoc,Mac,OS2,VMS,Win32}.3perl*
 
 ## We already have these *.pod files as man pages
-%{__rm} $RPM_BUILD_ROOT%{perl_privlib}/{Encode,Locale{,/Codes,/Maketext},Module,Net,Test,version}/*.pod
+%{__rm} $RPM_BUILD_ROOT%{perl_privlib}/{Encode,Locale{,/Maketext},Module,Net,Test,version}/*.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_privlib}/*.pod
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/*.pod
 
+## We don't build NDBM_File that Memoize::NDBM_File requires
+%{__rm} $RPM_BUILD_ROOT%{perl_privlib}/Memoize/NDBM_File.pm
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man3/Memoize::NDBM_File.3perl*
+
 install -d doc-base/{DynaLoader,Errno,File/Glob,IO,PathTools} \
        doc-devel/{Devel/Peek,ExtUtils/{CBuilder,ParseXS}} \
        doc-modules/{Attribute/Handlers,Carp,Data/Dumper,Hash/Util/FieldHash,I18N/LangTags,Locale/Maketext} \
@@ -931,7 +933,7 @@ owd=$(pwd)
 %{__rm} $RPM_BUILD_ROOT%{_mandir}/README.perl-non-english-man-pages
 
 # update and check perl-modules files
-echo '# Module versions from Perl %{ver} distribution.' > perl-modules
+echo '# Module versions from Perl %{ver} distribution.' > perl-modules.tmp
 for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do
        case $m in
        libnet)
@@ -939,26 +941,32 @@ for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do
                ;;
        # special cased since do eval on VERSION
        ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib)
-               v=$(%{__perl} -M$m -e "print version->parse(\$$m::VERSION)->numify")
+               v=$(%{__perl} -e "use $m; print version->parse(\$$m::VERSION)->numify")
+               ;;
+       # this module has VERSION encoded as int in a way that it loses trailing 0
+       Getopt::Long)
+               v=$(%{__perl} -e "use $m; print \$$m::VERSION_STRING")
                ;;
        *)
-               v=$(%{__perl} -M$m -e "print \$$m::VERSION")
+               v=$(%{__perl} -e "use $m; print \$$m::VERSION")
                ;;
        esac
-       echo "$m = $v"
-done | LC_ALL=C sort >> perl-modules
+       echo "$m = $v" >> perl-modules.tmp
+done
+LC_ALL=C sort perl-modules.tmp > perl-modules && rm perl-modules.tmp
 
-echo '# Non-straight named module versions from Perl %{ver} distribution.' > perl-modules2
+echo '# Non-straight named module versions from Perl %{ver} distribution.' > perl-modules2.tmp
 for m in $(awk '!/^#/ && !/^$/{print $1"!"$2}' %{SOURCE4}); do
        mn="${m##*!}"
        mp="${m%%!*}"
        case $m in
        *)
-               v=$(%{__perl} -M$mn -e "print \$$mn::VERSION")
+               v=$(%{__perl} -e "use $mn; print \$$mn::VERSION")
                ;;
        esac
-       echo "$mp       $mn = $v"
-done | LC_ALL=C sort >> perl-modules2
+       echo "$mp       $mn = $v" >> perl-modules2.tmp
+done
+LC_ALL=C sort perl-modules2.tmp > perl-modules2 && rm perl-modules2.tmp
 
 if ! cmp -s %{SOURCE3} perl-modules; then
        : %{SOURCE3} outdated with $(pwd)/perl-modules
@@ -1055,6 +1063,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_privlib}/Class
 %{perl_privlib}/Class/Struct.pm
 %{_mandir}/man3/Class::Struct.3perl*
+%{perl_privlib}/Compress
+%{_mandir}/man3/Compress::Zlib.3perl*
 %{perl_privlib}/Exporter.pm
 %{perl_privlib}/Exporter
 %{_mandir}/man3/Exporter*.3perl*
@@ -1078,6 +1088,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Tie::File.3perl*
 %{_mandir}/man3/Tie::Handle.3perl*
 %{_mandir}/man3/Tie::Hash.3perl*
+%{_mandir}/man3/Tie::Hash::NamedCapture.3perl*
 %{_mandir}/man3/Tie::Memoize.3perl*
 %{_mandir}/man3/Tie::RefHash.3perl*
 %{_mandir}/man3/Tie::Scalar.3perl*
@@ -1089,6 +1100,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/XSLoader.3perl*
 
 ## arch-dependent modules
+%{perl_archlib}/Compress
+%dir %{perl_archlib}/auto/Compress
+%dir %{perl_archlib}/auto/Compress/Raw
+%dir %{perl_archlib}/auto/Compress/Raw/Bzip2
+%attr(755,root,root) %{perl_archlib}/auto/Compress/Raw/Bzip2/Bzip2.so
+%dir %{perl_archlib}/auto/Compress/Raw/Zlib
+%attr(755,root,root) %{perl_archlib}/auto/Compress/Raw/Zlib/Zlib.so
+%{_mandir}/man3/Compress::Raw::Bzip2.3perl*
+%{_mandir}/man3/Compress::Raw::Zlib.3perl*
+
 %{perl_archlib}/Config.pm
 %{perl_archlib}/Config_git.pl
 %{perl_archlib}/Config_heavy.pl
@@ -1172,20 +1193,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{perl_archlib}/auto/Socket/Socket.so
 %{_mandir}/man3/Socket.3perl*
 
-%dir %{perl_archlib}/Tie
-%dir %{perl_archlib}/Tie/Hash
-%{perl_archlib}/Tie/Hash/NamedCapture.pm
-%dir %{perl_archlib}/auto/Tie
-%dir %{perl_archlib}/auto/Tie/Hash
-%dir %{perl_archlib}/auto/Tie/Hash/NamedCapture
-%attr(755,root,root) %{perl_archlib}/auto/Tie/Hash/NamedCapture/NamedCapture.so
-%{_mandir}/man3/Tie::Hash::NamedCapture.3perl*
-
-%{perl_archlib}/arybase.pm
-%dir %{perl_archlib}/auto/arybase
-%attr(755,root,root) %{perl_archlib}/auto/arybase/arybase.so
-%{_mandir}/man3/arybase.3perl*
-
 %files devel
 %defattr(644,root,root,755)
 %doc doc-devel/*
@@ -1213,7 +1220,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/ExtUtils::Packlist.3perl*
 %{_mandir}/man3/ExtUtils::ParseXS*.3perl*
 %{_mandir}/man3/ExtUtils::Typemaps*.3perl*
-%{_mandir}/man3/ExtUtils::XSSymSet.3perl*
 %{_mandir}/man3/ExtUtils::testlib.3perl*
 %{perl_privlib}/vmsish.pm
 %{_mandir}/man3/vmsish.3perl*
@@ -1375,18 +1381,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/B.3perl*
 %{_mandir}/man3/B::*.3perl*
 
-%{perl_privlib}/Compress
-%{perl_archlib}/Compress
-%dir %{perl_archlib}/auto/Compress
-%dir %{perl_archlib}/auto/Compress/Raw
-%dir %{perl_archlib}/auto/Compress/Raw/Bzip2
-%attr(755,root,root) %{perl_archlib}/auto/Compress/Raw/Bzip2/Bzip2.so
-%dir %{perl_archlib}/auto/Compress/Raw/Zlib
-%attr(755,root,root) %{perl_archlib}/auto/Compress/Raw/Zlib/Zlib.so
-%{_mandir}/man3/Compress::Raw::Bzip2.3perl*
-%{_mandir}/man3/Compress::Raw::Zlib.3perl*
-%{_mandir}/man3/Compress::Zlib.3perl*
-
 %{perl_archlib}/Data
 %dir %{perl_archlib}/auto/Data
 %dir %{perl_archlib}/auto/Data/Dumper
@@ -1541,12 +1535,12 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_privlib}/JSON
 %{_mandir}/man3/JSON::PP*.3perl*
 %{perl_privlib}/Locale
-%{_mandir}/man3/Locale::Codes*.3perl*
-%{_mandir}/man3/Locale::Country.3perl*
-%{_mandir}/man3/Locale::Currency.3perl*
-%{_mandir}/man3/Locale::Language.3perl*
-%{_mandir}/man3/Locale::Maketext*.3perl*
-%{_mandir}/man3/Locale::Script.3perl*
+%{_mandir}/man3/Locale::Maketext.3*
+%{_mandir}/man3/Locale::Maketext::Cookbook.3*
+%{_mandir}/man3/Locale::Maketext::Guts.3*
+%{_mandir}/man3/Locale::Maketext::GutsLoader.3*
+%{_mandir}/man3/Locale::Maketext::Simple.3*
+%{_mandir}/man3/Locale::Maketext::TPJ13.3*
 %{perl_privlib}/Memoize
 %{perl_privlib}/Memoize.pm
 %{_mandir}/man3/Memoize*.3perl*
@@ -1600,16 +1594,10 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_privlib}/Pod
 %{_mandir}/man3/Pod::Checker.3perl*
 %{_mandir}/man3/Pod::Escapes.3perl*
-%{_mandir}/man3/Pod::Find.3perl*
 %{_mandir}/man3/Pod::Html.3perl*
-%{_mandir}/man3/Pod::InputObjects.3perl*
 %{_mandir}/man3/Pod::Man.3perl*
 %{_mandir}/man3/Pod::ParseLink.3perl*
-%{_mandir}/man3/Pod::ParseUtils.3perl*
-%{_mandir}/man3/Pod::Parser.3perl*
 %{_mandir}/man3/Pod::Perldoc*.3perl*
-%{_mandir}/man3/Pod::PlainText.3perl*
-%{_mandir}/man3/Pod::Select.3perl*
 %{_mandir}/man3/Pod::Simple*.3perl*
 %{_mandir}/man3/Pod::Text*.3perl*
 %{_mandir}/man3/Pod::Usage.3perl*
@@ -1699,6 +1687,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/ptardiff.1*
 %attr(755,root,root) %{_bindir}/shasum
 %{_mandir}/man1/shasum.1*
+%attr(755,root,root) %{_bindir}/streamzip
+%{_mandir}/man1/streamzip.1*
 %attr(755,root,root) %{_bindir}/zipdetails
 %{_mandir}/man1/zipdetails.1*
 
@@ -1745,6 +1735,7 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_archlib}/encoding.pm
 %dir %{perl_archlib}/auto/Encode
 %dir %{perl_archlib}/auto/Encode/*/
+%attr(755,root,root) %{perl_archlib}/auto/Encode/*.so
 %attr(755,root,root) %{perl_archlib}/auto/Encode/*/*.so
 %{_mandir}/man1/enc2xs.1*
 %{_mandir}/man1/piconv.1*