- fixed List::Util broken by hack in build (undefined symbol cxinc)

[packages/perl.git] / perl.spec

diff --git a/perl.spec b/perl.spec
index d748d09ac0c41079e9fcadbe456df84287d4b9d9..25838283e49d300014609c8a1b2f441ce1296838 100644 (file)
--- a/perl.spec
+++ b/perl.spec
@@ -58,7 +58,7 @@ Summary(tr):  Kabuk yorumlama dili
 Summary(zh_CN):        Perl ±à³ÌÓïÑÔ¡£
 Name:          perl
 Version:       5.8.2
-Release:       2%{?_without_threads:_nothr}%{?_without_largefiles:_nolfs}
+Release:       3%{?_without_threads:_nothr}%{?_without_largefiles:_nolfs}
 Epoch:         1
 License:       GPL or Artistic
 Group:         Development/Languages/Perl
@@ -73,6 +73,7 @@ Patch1:               %{name}_581-INC.patch
 Patch3:                %{name}_580-errno_h-parsing.patch
 Patch4:                %{name}_580-use-LD_PRELOAD-for-libperl.so.patch
 Patch5:                %{name}_581-soname.patch
+Patch6:                %{name}-test-noproc.patch
 #Patch8:               %{name}_580-microperl_uconfig.patch
 URL:           http://www.perl.com/
 # versions [4.2, 4.3-0.20030610.20.1] are not supported
@@ -272,7 +273,7 @@ Perl 
 %package base
 Summary:       Base perl components for a minimal installation
 Summary(pl):   Podstawowe sk³adniki potrzebne do minimalnej instalacji perla
-Group:         Text/Applications
+Group:         Development/Languages/Perl
 Provides:      perl-File-Compare = 1.1003
 Provides:      perl-File-Spec = 0.86
 Provides:      perl-File-Temp = 0.14
@@ -621,6 +622,7 @@ microperlu - popraw je.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 #%patch8 -p1
 
 install -m 0755 %{SOURCE2} $PWD/find-perl.prov
@@ -649,7 +651,7 @@ sh Configure \
        -Ui_db \
        %{?_without_gdbm:  -Ui_dbm -Ui_gdbm -Ui_ndbm} \
        %{?!_without_gdbm: -Ui_dbm -Di_gdbm -Ui_ndbm} \
-       -Dlibswanted="dl m c crypt %{?!_without_dbm:gdbm}" \
+       -Dlibswanted="dl m c crypt %{?!_without_gdbm:gdbm}" \
        -%{?_without_threads:U}%{?!_without_threads:D}usethreads \
        -%{?_without_largefiles:U}%{?!_without_largefiles:D}uselargefiles
 
@@ -667,7 +669,7 @@ mv ext/List/Util/lib/List/Util.pm ext/List/Util
 rm -f ext/List/Util/Makefile.PL
 cat <<EOF > ext/List/Util/Makefile.PL
 use ExtUtils::MakeMaker;
-WriteMakefile(NAME=>"List::Util", VERSION_FROM=>"Util.pm");
+WriteMakefile(NAME=>"List::Util", VERSION_FROM=>"Util.pm", DEFINE=>"-DPERL_EXT");
 EOF
 
 %{__make} \
@@ -775,11 +777,11 @@ install -d AI/NeuralNet Algorithm Apache Archive Array Astro Attribute \
        auto/{AI,Array,Config,Crypt,Data,Mail,Net,Schedule,Statistics,Text,WWW}
 
 cd $RPM_BUILD_ROOT%{perl_vendorarch}
-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/BigInt,Net,Regexp} \
+install -d Algorithm Astro Audio Authen B BSD Bit Compress Convert \
+       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,Convert,Crypt/OpenSSL,Data} \
+       auto/{Devel,Digest,File,IPC,Inline,Locale,Math/BigInt,Net,Regexp} \
        auto/{Speech/Recognizer,String,Sys,Term,Text,Unicode,XML}
 )