X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=perl.spec;h=fe16e060f815404b33488bc5e1d0a188f76b837b;hb=b33bbb1;hp=d6d459b6f34bec021433f433836601bf67f7e8dd;hpb=9594b95727d73e08ba432e90c7ec9553d082c266;p=packages%2Fperl.git

diff --git a/perl.spec b/perl.spec
index d6d459b..fe16e06 100644
--- 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.30.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	1
+%define		ver	5.30.2
+%define		rel	3
 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:	4bfa12b528522a50de0470b8b70b9b3b
 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,7 +84,7 @@ 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
@@ -312,6 +312,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 +422,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 +437,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
@@ -490,7 +490,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
@@ -870,10 +869,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} \
@@ -941,6 +944,10 @@ for m in $(awk '!/^#/ && !/^$/{print $1}' %{SOURCE3}); do
 	ExtUtils::CBuilder|Compress::Raw::Bzip2|Compress::Raw::Zlib)
 		v=$(%{__perl} -M$m -e "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} -M$m -e "print \$$m::VERSION_STRING")
+		;;
 	*)
 		v=$(%{__perl} -M$m -e "print \$$m::VERSION")
 		;;
@@ -1055,6 +1062,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*
@@ -1089,6 +1098,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
@@ -1181,11 +1200,6 @@ rm -rf $RPM_BUILD_ROOT
 %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/*
@@ -1375,18 +1389,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 +1543,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*