- fixed bug, which could cause providing "perl()"

[packages/perl.git] / perl.spec

diff --git a/perl.spec b/perl.spec
index 5c5ac9e1322784edda3b622713d847d07b5a3f29..f3fcaa97d117d79251a6de092237087cbe772874 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -6,11 +6,7 @@
 %bcond_without microperl       # don't build microperl
 #
 # TODO:
-# - 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...
 # - fix "FIXME"s, review "XXX"s
-# - fix perl.prov's handling in rpm -- it should use the __perl macro
 # - add the {O,N}DBM_File modules
 # - review the perldiag.pod issue
 # - consider disabling ithreads by default
@@ -19,10 +15,6 @@
 #
 # 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?)
 #
 
 %define _abi   5.8.0
@@ -59,7 +51,7 @@ Summary(tr):  Kabuk yorumlama dili
 Summary(zh_CN):        Perl ±à³ÌÓïÑÔ¡£
 Name:          perl
 Version:       5.8.4
-Release:       2%{!?with_threads:_nothr}
+Release:       4%{!?with_threads:_nothr}
 Epoch:         1
 License:       GPL v1+ or Artistic
 Group:         Development/Languages/Perl
@@ -273,8 +265,9 @@ Provides:   perl-Safe = 2.10
 Provides:      perl-Socket = 1.77
 Provides:      perl-Tie-File = 0.97
 Provides:      perl(largefiles)
-# broken, unsupported module
+# broken, unsupported modules
 Obsoletes:     perl-SOAP
+Obsoletes:     perl-Sort-PolySort
 
 %description base
 Base components, files, core modules, etc. -- a minimal usable perl
@@ -413,6 +406,7 @@ Summary:    perldoc - Look up Perl documentation in pod format
 Summary(pl):   perldoc - przeszukiwanie dokumentacji Perla w formacie pod
 Provides:      perldoc = 3.12@%{version}
 Requires:      %{name}-modules
+Requires:      %{name}-tools-pod
 Group:         Development/Tools
 
 %description perldoc
@@ -635,7 +629,7 @@ sh Configure \
        -Dvendorman1=%{_mandir}/man1 -Dvendorman1ext=1p \
        -Dvendorman3=%{_mandir}/man3 -Dvendorman3ext=3pm \
        -Dsiteman1=%{_usr}/local/share/man/man1 -Dsiteman1ext=1p \
-       -Dsiteman3=%{_usr}/local/share/man/man3p -Dsiteman3ext=3pm \
+       -Dsiteman3=%{_usr}/local/share/man/man3 -Dsiteman3ext=3pm \
        -Dprefix=%{_prefix} -Dvendorprefix=%{_prefix} -Dsiteprefix=%{_usr}/local \
        -Dlibpth="%{_libdir} /%{_lib}" \
        -Dprivlib=%{perl_privlib}     -Darchlib=%{perl_archlib} \