X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=perl.spec;h=34592273b305ea6af2a29b276c5bf949a541575b;hb=969db6b673a4198e7b5926e73fd6f6cb2cfcefd8;hp=feef5ea5199bfc6fb803ba256baa27a132620427;hpb=53fff73d989ca75cc4e9d9dbebbdea30a58ee7df;p=packages%2Fperl.git

diff --git a/perl.spec b/perl.spec
index feef5ea..3459227 100644
--- a/perl.spec
+++ b/perl.spec
@@ -6,24 +6,23 @@
 # _without_gdbm       - build without the GDBM_File module
 #
 # TODO:
-# - Think about unicore.  If uf8*.pm, encode.pm, charnamess.pm (and
+# - Think about unicore.  If uf8*.pm, encode.pm, charnames.pm (and
 #   probably others) are in the perl-base package, unicore should also
 #   be there.  But it's 5MB...
-# - Think about the package separation.  Split between perl, perl-base
-#   and perl-modules is far from obvius.
 # - fix "FIXME"s, review "XXX"s
 # - fix perl.prov's handling in rpm -- it should use the __perl macro
-# - fix some duplicate files
 # - add the {O,N}DBM_File modules
-# - *TESTING*
+# - review the perldiag.pod issue
+# - consider disabling ithreads by default
+# - consider introducing perl-dirs
+#
+# TODO for perl-dependent packages:
+# - change all "R/BR: perl" to one of perl-{base,modules,devel}
+# - use the requires_eq(perl-base) for all packages strictly depending
+#   on the perl version used for building (files in perl_vendorarch
+#   directories; dependency on libperl.so.* often doesn't exist)
+#   (should this be done on Ra-branch, too?)
 #
-
-%if 0%(if [ %{__perl_requires} ]; then echo 1; fi)
-%undefine	__perl_requires
-%define		__perl_provides	%{_builddir}/%{name}-%{version}/find-perl-provides.sh
-%else
-%define		__find_provides %{_builddir}/%{name}-%{version}/find-perl-provides.sh
-%endif
 
 %define		perlthread	%{?!_without_threads:-thread-multi}
 
@@ -57,12 +56,14 @@ Summary(tr):	Kabuk yorumlama dili
 Summary(zh_CN):	Perl ±à³ÌÓïÑÔ¡£
 Name:		perl
 Version:	5.8.0
-Release:	0.35%{?_without_threads:_nothr}%{?_without_largefiles:_nolfs}
+Release:	2%{?_without_threads:_nothr}%{?_without_largefiles:_nolfs}
 Epoch:		1
-License:	GPL v1+ or Artistic
+License:	GPL or Artistic
 Group:		Development/Languages/Perl
 Source0:	http://www.cpan.org/src/%{name}-%{version}.tar.gz
-Source1:	%{name}-non-english-man-pages.tar.bz2
+# Source0-md5:	d9bdb180620306023fd35901a2878b62
+Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
+# Source1-md5:	de47d7893f49ad7f41ba69c78511c0db
 Source2:	%{name}.prov
 Source3:	find-perl-provides.sh
 Patch0:		%{name}_580-noroot_install.patch
@@ -71,16 +72,29 @@ Patch2:		%{name}_580-MakeMaker.patch
 Patch3:		%{name}_580-errno_h-parsing.patch
 Patch4:		%{name}_580-use-LD_PRELOAD-for-libperl.so.patch
 Patch5:		%{name}_580-soname.patch
-Patch6:		%{name}_580-perluniintro.patch
-Patch7:		%{name}_580-Safe.patch
-Patch8:		%{name}_580-microperl_uconfig.patch
+Patch6:		%{name}_580-Safe.patch
+Patch7:		%{name}_580-microperl_uconfig.patch
 URL:		http://www.perl.com/
-Requires:	%{name}-base = %{version}
-Requires:	%{name}-modules = %{version}
-Requires:	perldoc
+# versions [4.2, 4.3-0.20030610.20.1] are not supported
+BuildRequires:	rpm-build >= 4.3-0.20030610.20.2
 %{?!_without_gdbm:BuildRequires:	gdbm-devel}
+Requires:	%{name}-base = %{epoch}:%{version}
+Requires:	%{name}-modules = %{epoch}:%{version}
+Requires:	perl-doc-reference
+Requires:	perldoc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		__perl	LD_LIBRARY_PATH="%{_builddir}/%{name}-%{version}" PERL5LIB="%{buildroot}%{perl_privlib}:%{buildroot}%{perl_archlib}" %{buildroot}%{_bindir}/perl
+
+%if 0%{?_use_internal_dependency_generator:1}
+%define		_use_internal_dependency_generator 0
+# we can do it as there is no _noautoprov* in this spec
+%define		__find_provides /usr/bin/rpmdeps --define="__perl_provides /bin/sh -c '%{__perl} %{SOURCE2}'" --define="__perl_requires /bin/sh -c 'cat >/dev/null'" --provides
+%else
+# for rpm <= 4.1
+%define		__find_provides %{_builddir}/%{name}-%{version}/find-perl-provides.sh
+%endif
+
 %description
 Perl is an interpreted language optimized for scanning arbitrary text
 files, extracting information from those text files, and printing
@@ -262,8 +276,13 @@ Group:		Text/Applications
 Provides:	perl-File-Compare = 1.1003
 Provides:	perl-File-Spec = 0.83
 Provides:	perl-File-Temp = 0.13
+Provides:	perl-IO = 1.20
 Provides:	perl-Safe = 2.09
+Provides:	perl-Socket = 1.75
+Provides:	perl-Tie-File = 0.93
 %{?!_without_largefiles:Provides:	perl(largefiles)}
+# broken, unsupported module
+Obsoletes:	perl-SOAP
 
 %description base
 Base components, files, core modules, etc. -- a minimal usable perl
@@ -272,13 +291,14 @@ package) whenever possible.
 
 %description base -l pl
 Podstawowe sk³adniki, pliki, g³ówne modu³y itp. - minimalna instalacja
-Perla, nadaj±ca siê do u¿ytku. Zaleca siê instalacjê pe³nego perla
+perla, nadaj±ca siê do u¿ytku. Zaleca siê instalacjê pe³nego perla
 (pakietu perl), je¶li to tylko mo¿liwe.
 
 %package GDBM_File
 Summary:	GDBM_File - Perl5 access to the gdbm library
+Summary(pl):	GDBM_File - dostêp do biblioteki gdbm w Perlu
 Group:		Libraries
-Requires:	%{name}-base = %{version}
+Requires:	%{name}-base = %{epoch}:%{version}
 # FIXME: Set Version: 1.06 and Release: 1 instead of inheriting
 #        values from the main package.  Why this causes setting
 #        version and release macros up to the end of this spec?
@@ -296,8 +316,8 @@ Summary:	Perl development files
 Summary(pl):	Pliki potrzebne przy tworzeniu w³asnych aplikacji w perlu
 Summary(pt_BR):	Arquivos de desenvolvimento e cabeçalhos para o perl
 Group:		Development/Libraries
-Requires:	%{name}-base = %{version}
-Requires:	%{name}-modules = %{version}
+Requires:	%{name}-base = %{epoch}:%{version}
+Requires:	%{name}-modules = %{epoch}:%{version}
 Requires:	%{name}-tools-pod
 Provides:	perl-CPAN = 1.61
 Provides:	perl-Devel-DProf = 20000000.00_01
@@ -333,7 +353,6 @@ POD.
 Summary:	Perl reference documentation
 Summary(pl):	Dokumentacja Perla
 Group:		Documentation
-Requires:	man
 
 %description doc-reference
 Reference documentation for the Practical Extraction and Report Language
@@ -347,7 +366,7 @@ Extraction and Report Language) i jego interpretera.
 Summary:	Modules from the core perl distribution
 Summary(pl):	Modu³y z podstawowej dystrybucji perla
 Group:		Libraries
-Requires:	%{name}-base = %{version}
+Requires:	%{name}-base = %{epoch}:%{version}
 Provides:	perl-Attribute-Handlers = 0.77
 Provides:	perl-CGI = 2.81
 Provides:	perl-Class-ISA = 0.32
@@ -356,7 +375,6 @@ Provides:	perl-Digest-MD5 = 2.20
 Provides:	perl-Filter-Simple = 0.78
 Provides:	perl-FindBin = 1.43
 #Provides:	perl-Hash-Utils = 0.04	Data::Util is missing
-Provides:	perl-IO = 1.20
 Provides:	perl-IPC-SysV = 1.03_00
 Provides:	perl-Locale-Maketext = 1.03
 Provides:	perl-MIME-Base64 = 2.12
@@ -369,7 +387,6 @@ Provides:	perl-PerlIO-via-QuotedPrint = 0.04
 Provides:	perl-Pod-LaTeX = 0.54
 Provides:	perl-Pod-Parser = 1.13
 Provides:	perl-Scalar-List-Utils = 1.07_00
-Provides:	perl-Socket = 1.75
 Provides:	perl-Storable = 2.04
 Provides:	perl-Term-ANSIColor = 1.05
 Provides:	perl-Term-Cap = 1.07
@@ -380,7 +397,6 @@ Provides:	perl-Text-Balanced = 1.89
 Provides:	perl-Text-ParseWords = 3.21
 Provides:	perl-Text-Soundex = 1.01
 Provides:	perl-Text-Tabs+Wrap = 2001.0929
-Provides:	perl-Tie-File = 0.93
 Provides:	perl-Time-HiRes = 1.20_00
 Provides:	perl-UNIVERSAL = 1.00
 Provides:	perl-Unicode-Collate = 0.12
@@ -412,7 +428,7 @@ used for the documentation for the perl library modules.
 perldoc wyszukuje fragment dokumentacji w formacie .pod osadzony w
 drzewie instalacji perla lub w skypcie perlowym i wy¶wietla go przez
 "pod2man | nroff -man | $PAGER". Program ten u¿ywany jest g³ównie do
-dokumentacji modu³ów z bibliotek Perla.
+dokumentacji modu³ów z bibliotek perla.
 
 %package -n sperl
 Summary:	Perl setuid root binaries for use with setuid Perl scripts
@@ -422,14 +438,14 @@ Summary(fr):	sperl, 
 Summary(it):	sperl, da usare con gli script di Perl setuid
 Summary(ja):	Setuid Perl scripts ¤È°ì½ï¤Ë»ÈÍѤ¹¤ë¤¿¤á¤Î suidperl
 Summary(ko):	Setuid ÆÞ ½ºÅ©¸³Æ®¿Í ÇÔ²² »ç¿ëµÇ´Â suidperl
-Summary(pl):	Binaria setuid root Perla dla setuid-owych skryptów Perla
+Summary(pl):	Binaria setuid root perla dla setuid-owych skryptów perla
 Summary(pt):	O suidperl, para usar com os programas de Perl 'setuid'
 Summary(ru):	SUID ×ÅÒÓÉÑ ÑÚÙËÁ Perl
 Summary(sv):	sperl, att användas med setuid perlskript
 Summary(uk):	SUID-×ÅÒÓ¦Ñ ÍÏ×É Perl
 Summary(zh_CN):	sperl£¬ÓÃÀ´Óë setuid perl ½Å±¾Ò»ÆðʹÓÃ
 Group:		Development/Languages/Perl
-Requires:	%{name}-base = %{version}
+Requires:	%{name}-base = %{epoch}:%{version}
 Obsoletes:	perl-suidperl
 
 %description -n sperl
@@ -459,7 +475,7 @@ perl 
 %description -n sperl -l pl
 sperl jest to kopia setuid root programu binarnego perl umo¿liwiaj±ca
 bezpieczniejsze (miejmy nadziejê) uruchamianie setuidowych skryptów
-Perla.
+perla.
 
 %description -n sperl -l pt
 O suidperl é uma cópia do perl com 'setuid' que permite uma execução
@@ -484,7 +500,7 @@ setuid perl 
 Summary:	Various tools from the core perl distribution
 Summary(pl):	Ró¿ne narzêdzia z podstawowej dystrybucji perla
 Group:		Applications
-Requires:	%{name}-base = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}
 
 %description tools
 Various tools from the core perl distribution:
@@ -495,7 +511,7 @@ Various tools from the core perl distribution:
  psed, s2p - a stream editor
 
 %description tools -l pl
-Ró¿ne narzêdzia z podstawowej dystrybucji Perla:
+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
@@ -506,8 +522,8 @@ R
 Summary:	Developer's tools from the core perl distribution
 Summary(pl):	Narzêdzia z podstawowej dystrybucji perla, przeznaczone dla programistów
 Group:		Development/Tools
-Requires:	%{name}-base = %{version}
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-base = %{epoch}:%{version}
+Requires:	%{name}-devel = %{epoch}:%{version}
 
 %description tools-devel
 Various tools from the core perl distribution:
@@ -523,7 +539,7 @@ Various tools from the core perl distribution:
  splain        - force verbose warning diagnostics
 
 %description tools-devel -l pl
-Ró¿ne narzêdzia z podstawowej dystrybucji Perla:
+Ró¿ne narzêdzia z podstawowej dystrybucji perla:
 
  c2ph, pstruct - zrzucanie struktur C w postaci generowanej z tablic
                  symboli z cc -g -S
@@ -534,7 +550,7 @@ R
  h2xs          - konwerter plików nag³ówkowych .h z C na rozszerzenia
                  Perla
  perlcc        - generator binarek z programów w Perlu
- perlivp       - procedura weryfikacji instalacji Perla
+ perlivp       - procedura weryfikacji instalacji perla
  pl2pm         - zgrubne narzêdzie do t³umaczenia plików pl Perla 4 na
                  modu³y .pm Perla 5
  splain        - wymuszenie obszernych ostrze¿eñ diagnostycznych
@@ -543,7 +559,7 @@ R
 Summary:	Tools for manipulating files in the POD format
 Summary(pl):	Narzêdzia do przetwarzania plików w formacie POD
 Group:		Applications
-Requires:	%{name}-base = %{version}
+Requires:	%{name}-modules = %{epoch}:%{version}
 
 %description tools-pod
 Tools for manipulating files in the POD (Plain Old Documentation)
@@ -603,9 +619,8 @@ microperlu - popraw je.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p0
+%patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 install -m 0755 %{SOURCE2} $PWD/find-perl.prov
 install -m 0755 %{SOURCE3} $PWD/find-perl-provides.sh
@@ -676,10 +691,9 @@ rm -f uconfig.h
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{_mandir}/{ja,ko,zh_CN,zh_TW}/man1
 
 %{__make} install
-install miniperl  $RPM_BUILD_ROOT%{_bindir}
 install microperl $RPM_BUILD_ROOT%{_bindir}
 
 ## use symlinks instead of hardlinks
@@ -689,12 +703,10 @@ install microperl $RPM_BUILD_ROOT%{_bindir}
 %{__ln_s} -f  psed           $RPM_BUILD_ROOT%{_bindir}/s2p
 
 ## Fix lib
-rm -f $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so*
-install libperl.so.%{version} $RPM_BUILD_ROOT%{_libdir}
-%{__ln_s} -f libperl.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libperl.so
-
-
-%define		__perl	LD_LIBRARY_PATH="%{_builddir}/%{name}-%{version}" PERL5LIB="%{buildroot}/%{perl_privlib}:%{buildroot}/%{perl_archlib}" %{buildroot}/%{_bindir}/perl
+rm -f $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so
+%{__ln_s} `%{__perl} -e '$_="'%{perl_archlib}/CORE/libperl.so.%{version}'";s|^'%{_libdir}'/*||;print'` \
+	$RPM_BUILD_ROOT%{_libdir}/libperl.so.%{version}
+%{__ln_s} libperl.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libperl.so
 
 ## Fix Config.pm: remove buildroot path and change man pages extensions
 %{__perl} -pi -e 's,%{buildroot}/*,/,g'              $RPM_BUILD_ROOT%{perl_archlib}/Config.pm
@@ -720,6 +732,8 @@ WANTED='
 	sys/socket.h
 	sys/syscall.h
 	sys/time.h
+	linux/posix_types.h
+	linux/stddef.h
 '
 %{__perl} $H2PH -a -d $PHDIR $WANTED
 )
@@ -747,28 +761,33 @@ install -d $RPM_BUILD_ROOT{%{perl_vendorlib},%{perl_vendorarch},%{perl_vendorarc
 cd $RPM_BUILD_ROOT%{perl_vendorlib}
 install -d AI/NeuralNet Algorithm Apache Archive Array Astro Attribute \
 	Audio Authen B Bundle Business CGI Cache Chart Class Config \
-	Convert Crypt DBD Data Date Devel Device Digest Error ExtUtils \
-	File Filesys Font Games Getopt GnuPG Graph HTML HTTP I18N \
+	Convert Crypt DBD Data Date Devel Device Digest Email Error ExtUtils \
+	File Filesys Font Games Getopt GnuPG Graph Graphics HTML HTTP I18N \
 	IO/Socket IPC Image Inline Language Lingua/{EN,Stem/Snowball} \
-	List Locale LockFile Log MIME Mail Math Modem Module Net/SMTP \
+	List Locale LockFile Log MIME Mail Math/BigInt Modem Module Net/SMTP \
 	NetServer Netscape News Number OLE Parse Pod PostScript Proc \
 	RADIUS RPC RPM Regexp SOAP/Transport SQL Schedule Set Sort \
 	Speech Spreadsheet Statistics String Sub Sys TeX Test \
-	Text/Query Tie Time Tree Unicode WWW XML/{Filter,Handler,Parser} \
+	Text/Query Tie Time Tree UNIVERSAL Unicode WWW \
+	XML/{Filter,Handler,Parser} \
 	auto/{AI,Array,Config,Crypt,Data,Mail,Net,Schedule,Statistics,Text,WWW}
 
 cd $RPM_BUILD_ROOT%{perl_vendorarch}
-install -d Astro Audio Authen B BSD Bit Compress Crypt/OpenSSL Data Devel \
-	Digest File IPC Inline Locale Math Net Speech/Recognizer String Term \
-	Text Unicode XML \
+install -d Algorithm Astro Audio Authen B BSD Bit Compress Crypt/OpenSSL \
+	Data Devel Digest File IPC Inline Locale Math/BigInt Net \
+	Speech/Recognizer String Sys Term Text Unicode XML \
 	auto/{Astro,Audio,Authen,BSD,Bit,Compress,Crypt/OpenSSL,Data,Devel} \
-	auto/{Digest,File,IPC,Inline,Locale,Math,Net,Speech/Recognizer,String} \
-	auto/{Term,Text,Unicode,XML}
+	auto/{Digest,File,IPC,Inline,Locale,Math/BigInt,Net,Regexp} \
+	auto/{Speech/Recognizer,String,Sys,Term,Text,Unicode,XML}
 )
 
 ## non-english man pages
 %{__bzip2} -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perlcn.* $RPM_BUILD_ROOT%{_mandir}/zh_CN/man1
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perljp.* $RPM_BUILD_ROOT%{_mandir}/ja/man1
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perlko.* $RPM_BUILD_ROOT%{_mandir}/ko/man1
+mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perltw.* $RPM_BUILD_ROOT%{_mandir}/zh_TW/man1
 
 ## examples and demos
 install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-modules-%{version}
@@ -791,17 +810,6 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README AUTHORS
-%lang(cn) %doc README.cn
-%lang(jp) %doc README.jp
-%lang(ko) %doc README.ko
-%lang(tw) %doc README.tw
-
-%dir %{_libdir}/perl5/vendor_perl
-%dir %{_libdir}/perl5/vendor_perl/%{version}
-%{perl_vendorarch}
-%{perl_vendorlib}
-#%dir %{perl_vendorarch}/auto
-
 
 %files base
 %defattr(644,root,root,755)
@@ -818,31 +826,50 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{perl_archlib}
 %dir %{perl_archlib}/auto
 
-# pragmas
-%{perl_privlib}/[a-z]*.pm
-%{perl_privlib}/[a-z]*.pl
-%{perl_privlib}/warnings
-%{perl_archlib}/[a-z]*.pm
-%{perl_archlib}/threads
-%dir %{perl_archlib}/auto/attrs
-%dir %{perl_archlib}/auto/re
-%dir %{perl_archlib}/auto/threads
-%dir %{perl_archlib}/auto/threads/shared
-%attr(755,root,root) %{perl_archlib}/auto/attrs/*.so
-%attr(755,root,root) %{perl_archlib}/auto/re/*.so
-%attr(755,root,root) %{perl_archlib}/auto/threads/*.so
-%attr(755,root,root) %{perl_archlib}/auto/threads/shared/*.so
-%{perl_archlib}/auto/attrs/*.bs
-%{perl_archlib}/auto/re/*.bs
-%{perl_archlib}/auto/threads/*.bs
-%{perl_archlib}/auto/threads/shared/*.bs
-%{_mandir}/man3/[a-z]*
+%dir %{perl_archlib}/CORE
+%attr(755,root,root) %{perl_archlib}/CORE/libperl.so.%{version}
+%attr(755,root,root) %{_libdir}/libperl.so.*
 
-# arch-_IN_dependent modules
+%dir %{_libdir}/perl5/vendor_perl
+%dir %{_libdir}/perl5/vendor_perl/%{version}
+%{perl_vendorarch}
+%{perl_vendorlib}
+
+## pragmas
+%{perl_privlib}/base.pm
+%{_mandir}/man3/base.*
+%{perl_privlib}/constant.pm
+%{_mandir}/man3/constant.*
+%{perl_privlib}/diagnostics.pm
+%{_mandir}/man3/diagnostics.*
+%{perl_privlib}/fields.pm
+%{_mandir}/man3/fields.*
+%{perl_privlib}/integer.pm
+%{_mandir}/man3/integer.*
+%{perl_privlib}/overload.pm
+%{_mandir}/man3/overload.*
+%{perl_privlib}/sort.pm
+%{_mandir}/man3/sort.*
+%{perl_privlib}/strict.pm
+%{_mandir}/man3/strict.*
+%{perl_privlib}/subs.pm
+%{_mandir}/man3/subs.*
+%{perl_privlib}/vars.pm
+%{_mandir}/man3/vars.*
+%{perl_privlib}/warnings*
+%{_mandir}/man3/warnings*
+
+%{perl_archlib}/lib.pm
+%{_mandir}/man3/lib.*
+
+## arch-_IN_dependent modules
 %{perl_privlib}/Auto*
 %{_mandir}/man3/Auto*
 %{perl_privlib}/Carp*
 %{_mandir}/man3/Carp*
+%dir %{perl_privlib}/Class
+%{perl_privlib}/Class/Struct*
+%{_mandir}/man3/Class::Struct*
 %{perl_privlib}/Exporter*
 %{_mandir}/man3/Exporter*
 %{perl_privlib}/English*
@@ -851,8 +878,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Getopt*
 %{perl_privlib}/IPC
 %{_mandir}/man3/IPC::Open*
+%{perl_privlib}/SelectSaver.pm
+%{_mandir}/man3/SelectSaver.*
+%{perl_privlib}/Symbol.pm
+%{_mandir}/man3/Symbol.*
+%{perl_privlib}/Tie
+%{_mandir}/man3/Tie::*
 
-# arch-dependent modules
+## arch-dependent modules
 %{perl_archlib}/Config*
 %{_mandir}/man3/Config*
 %{perl_archlib}/DynaLoader*
@@ -885,6 +918,13 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_archlib}/auto/File/*/*.bs
 %{_mandir}/man3/File*
 
+%{perl_privlib}/IO
+%{perl_archlib}/IO*
+%dir %{perl_archlib}/auto/IO
+%attr(755,root,root) %{perl_archlib}/auto/IO/*.so
+%{perl_archlib}/auto/IO/*.bs
+%{_mandir}/man3/IO*
+
 %{perl_archlib}/Opcode.*
 %dir %{perl_archlib}/auto/Opcode
 %attr(755,root,root) %{perl_archlib}/auto/Opcode/*.so
@@ -909,7 +949,11 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_archlib}/auto/POSIX/*.ix
 %{_mandir}/man3/POSIX.*
 
-%attr(755,root,root) %{_libdir}/lib*.so.%{version}
+%{perl_archlib}/Socket.*
+%dir %{perl_archlib}/auto/Socket
+%attr(755,root,root) %{perl_archlib}/auto/Socket/*.so
+%{perl_archlib}/auto/Socket/*.bs
+%{_mandir}/man3/Socket.*
 
 
 %if %{?!_without_gdbm:1}0
@@ -925,8 +969,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{perl_archlib}/CORE
+%attr(755,root,root) %{_libdir}/libperl.so
+%{perl_archlib}/CORE/*.h
 
 # FIXME: Changes file to _docdir (and rm MANIFEST.SKIP?)
 %{perl_privlib}/ExtUtils
@@ -988,18 +1032,74 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/perlcompile.*
 %{_mandir}/man1/perld[!o]*
 %{_mandir}/man1/perli[!v]*
-%lang(cn) %{_mandir}/man1/perlcn.*
-%lang(jp) %{_mandir}/man1/perljp.*
-%lang(ko) %{_mandir}/man1/perlko.*
-
+%lang(zh_CN) %{_mandir}/zh_CN/man1/perlcn.*
+%lang(ja) %{_mandir}/ja/man1/perljp.*
+%lang(ko) %{_mandir}/ko/man1/perlko.*
+%lang(zh_TW) %{_mandir}/zh_TW/man1/perltw.*
 
 %files modules
 %defattr(644,root,root,755)
 %{_examplesdir}/%{name}-modules-%{version}
 
-# XXX: should it really be in this package?
 %{perl_privlib}/unicore
 
+## pragmas
+%{perl_privlib}/attributes.pm
+%{_mandir}/man3/attributes.*
+%{perl_privlib}/autouse.pm
+%{_mandir}/man3/autouse.*
+%{perl_privlib}/big*.pm
+%{_mandir}/man3/big*
+%{perl_privlib}/blib.pm
+%{_mandir}/man3/blib.*
+%{perl_privlib}/bytes.pm
+%{_mandir}/man3/bytes.*
+%{perl_privlib}/charnames.pm
+%{_mandir}/man3/charnames.*
+%{perl_privlib}/filetest.pm
+%{_mandir}/man3/filetest.*
+%{perl_privlib}/if.pm
+%{_mandir}/man3/if.*
+%{perl_privlib}/less.pm
+%{_mandir}/man3/less.*
+%{perl_privlib}/locale.pm
+%{_mandir}/man3/locale.*
+%{perl_privlib}/open.pm
+%{_mandir}/man3/open.*
+%{perl_privlib}/sigtrap.pm
+%{_mandir}/man3/sigtrap.*
+%{perl_privlib}/utf8.pm
+%{_mandir}/man3/utf8.*
+
+%{perl_archlib}/attrs.pm
+%dir %{perl_archlib}/auto/attrs
+%{perl_archlib}/auto/attrs/*.bs
+%attr(755,root,root) %{perl_archlib}/auto/attrs/*.so
+%{_mandir}/man3/attrs.*
+%{perl_archlib}/re.pm
+%dir %{perl_archlib}/auto/re
+%{perl_archlib}/auto/re/*.bs
+%attr(755,root,root) %{perl_archlib}/auto/re/*.so
+%{_mandir}/man3/re.*
+%{perl_archlib}/encoding.pm
+%{_mandir}/man3/encoding.*
+%{perl_archlib}/ops.pm
+%{_mandir}/man3/ops.*
+
+%if %{?!_without_threads:1}0
+%{perl_archlib}/threads*
+%dir %{perl_archlib}/auto/threads
+%dir %{perl_archlib}/auto/threads/shared
+%{perl_archlib}/auto/threads/*.bs
+%{perl_archlib}/auto/threads/shared/*.bs
+%attr(755,root,root) %{perl_archlib}/auto/threads/*.so
+%attr(755,root,root) %{perl_archlib}/auto/threads/shared/*.so
+%{_mandir}/man3/t*
+%endif
+
+## old *.pl files
+%{perl_privlib}/*.pl
+
 ## *.ph files (could be made a separate package, but an autohelper's support is needed)
 %{perl_archlib}/*.ph
 %{perl_archlib}/asm
@@ -1051,13 +1151,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_archlib}/auto/I18N/*/*.ix
 %{_mandir}/man3/I18N::*
 
-%{perl_privlib}/IO
-%{perl_archlib}/IO*
-%dir %{perl_archlib}/auto/IO
-%attr(755,root,root) %{perl_archlib}/auto/IO/*.so
-%{perl_archlib}/auto/IO/*.bs
-%{_mandir}/man3/IO*
-
 %{perl_archlib}/IPC
 %dir %{perl_archlib}/auto/IPC
 %dir %{perl_archlib}/auto/IPC/*/
@@ -1085,12 +1178,6 @@ rm -rf $RPM_BUILD_ROOT
 %{perl_archlib}/auto/SDBM_File/*.bs
 %{_mandir}/man3/SDBM_File.*
 
-%{perl_archlib}/Socket.*
-%dir %{perl_archlib}/auto/Socket
-%attr(755,root,root) %{perl_archlib}/auto/Socket/*.so
-%{perl_archlib}/auto/Socket/*.bs
-%{_mandir}/man3/Socket.*
-
 %{perl_archlib}/Storable.*
 %dir %{perl_archlib}/auto/Storable
 %attr(755,root,root) %{perl_archlib}/auto/Storable/*.so
@@ -1131,8 +1218,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Benchmark*
 %{perl_privlib}/CGI*
 %{_mandir}/man3/CGI*
-%{perl_privlib}/Class
-%{_mandir}/man3/Class::*
+%{perl_privlib}/Class/ISA*
+%{_mandir}/man3/Class::ISA*
 %{perl_privlib}/DirHandle*
 %{_mandir}/man3/DirHandle*
 %{perl_privlib}/Dumpvalue.*
@@ -1165,8 +1252,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Scalar::*
 %{perl_privlib}/Search
 %{_mandir}/man3/Search::*
-%{perl_privlib}/SelectSaver.*
-%{_mandir}/man3/SelectSaver.*
 %{perl_privlib}/SelfLoader.*
 %{_mandir}/man3/SelfLoader.*
 %{perl_privlib}/Shell.*
@@ -1174,8 +1259,6 @@ rm -rf $RPM_BUILD_ROOT
 # FIXME: README and Changes files
 %{perl_privlib}/Switch.*
 %{_mandir}/man3/Switch.*
-%{perl_privlib}/Symbol.*
-%{_mandir}/man3/Symbol.*
 # FIXME: README and Changes files
 %{perl_privlib}/Term
 %{_mandir}/man3/Term::*
@@ -1184,11 +1267,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/Test*
 %{perl_privlib}/Text
 %{_mandir}/man3/Text::*
-# XXX: to perl-base?
+%if %{?!_without_threads:1}0
 %{perl_privlib}/Thread*
 %{_mandir}/man3/Thread*
-%{perl_privlib}/Tie
-%{_mandir}/man3/Tie::*
+%endif
 %{perl_privlib}/Time
 %{_mandir}/man3/Time::[La-z]*
 # XXX: to perl-base?