From f7eadb3356007cd498ffc893e013e0b35a5aa2409c62d733128b745526c88dc9 Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Thu, 1 Apr 2010 16:16:32 +0000
Subject: [PATCH] Accepting request 36640 from devel:languages:perl

checked in (request 36640)

OBS-URL: https://build.opensuse.org/request/show/36640
OBS-URL: https://build.opensuse.org/package/show/devel:languages:perl/perl?expand=0&rev=28
---
 perl-5.12.0.dif => perl-5.10.1.dif | 363 +++++++++++++++++------------
 perl-5.10.1.tar.bz2                |   3 +
 perl-5.12.0-RC1.tar.bz2            |   3 -
 perl-gracefull-net-ftp.diff        |   8 +-
 perl-netcmdutf8.diff               |   4 +-
 perl-nroff.diff                    |   8 +-
 perl-regexp-refoverflow.diff       |  12 +-
 perl-threads.diff                  |  29 +++
 perl.changes                       |  17 --
 perl.spec                          | 199 ++++++++--------
 10 files changed, 362 insertions(+), 284 deletions(-)
 rename perl-5.12.0.dif => perl-5.10.1.dif (70%)
 create mode 100644 perl-5.10.1.tar.bz2
 delete mode 100644 perl-5.12.0-RC1.tar.bz2
 create mode 100644 perl-threads.diff

diff --git a/perl-5.12.0.dif b/perl-5.10.1.dif
similarity index 70%
rename from perl-5.12.0.dif
rename to perl-5.10.1.dif
index d8fb241..69aabb5 100644
--- a/perl-5.12.0.dif
+++ b/perl-5.10.1.dif
@@ -1,6 +1,6 @@
---- ./Configure.orig	2010-02-18 18:53:53.000000000 +0000
-+++ ./Configure	2010-03-23 11:31:19.000000000 +0000
-@@ -114,7 +114,7 @@ paths="$paths /usr/5bin /etc /usr/gnu/bi
+--- ./Configure.orig	2009-08-18 19:03:53.000000000 +0000
++++ ./Configure	2009-09-04 07:02:18.000000000 +0000
+@@ -109,7 +109,7 @@ paths="$paths /usr/5bin /etc /usr/gnu/bi
  paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
  paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
  paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
@@ -9,7 +9,7 @@
  paths="$paths /sbin /usr/sbin /usr/libexec"
  paths="$paths /system/gnu_library/bin"
  
-@@ -1316,7 +1316,7 @@ loclibpth="/usr/local/lib /opt/local/lib
+@@ -1307,7 +1307,7 @@ loclibpth="/usr/local/lib /opt/local/lib
  loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
  
  : general looking path for locating libraries
@@ -18,7 +18,7 @@
  glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
  test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
  test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
-@@ -2375,7 +2375,7 @@ uname
+@@ -2366,7 +2366,7 @@ uname
  zip
  "
  pth=`echo $PATH | sed -e "s/$p_/ /g"`
@@ -27,7 +27,7 @@
  for file in $loclist; do
  	eval xxx=\$$file
  	case "$xxx" in
-@@ -11202,7 +11202,7 @@ void xxx(int n, ...)
+@@ -11173,7 +11173,7 @@ void xxx(int n, ...)
      va_start(args, n);
      exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
  }
@@ -36,7 +36,7 @@
  
  #else /* I_VARARGS */
  
-@@ -11214,7 +11214,7 @@ va_dcl
+@@ -11185,7 +11185,7 @@ va_dcl
      va_start(args);
      exit((unsigned long)vsprintf(buf,"%s",args) > 10L);
  }
@@ -45,7 +45,7 @@
  
  #endif
  
-@@ -19017,14 +19017,20 @@ int main(int argc, char *argv[])
+@@ -18908,14 +18908,20 @@ int main(int argc, char *argv[])
  }
  EOCP
  	set try
@@ -66,7 +66,7 @@
  		i_db=$undef
  		case " $libs " in
  		*"-ldb "*)
-@@ -19067,7 +19073,7 @@ int main()
+@@ -18958,7 +18964,7 @@ int main()
  }
  #endif
  EOCP
@@ -75,7 +75,7 @@
  		if $contains warning try.out >>/dev/null 2>&1 ; then
  			db_hashtype='int'
  		else
-@@ -19112,7 +19118,7 @@ int main()
+@@ -19003,7 +19009,7 @@ int main()
  }
  #endif
  EOCP
@@ -84,7 +84,7 @@
  		if $contains warning try.out >>/dev/null 2>&1 ; then
  			db_prefixtype='int'
  		else
-@@ -23111,7 +23117,7 @@ passcat='$passcat'
+@@ -22973,7 +22979,7 @@ passcat='$passcat'
  patchlevel='$patchlevel'
  path_sep='$path_sep'
  perl5='$perl5'
@@ -93,8 +93,8 @@
  perl_patchlevel='$perl_patchlevel'
  perladmin='$perladmin'
  perllibs='$perllibs'
---- ./SuSE/SuSEconfig.perl.orig	2010-03-23 11:31:19.000000000 +0000
-+++ ./SuSE/SuSEconfig.perl	2010-03-23 11:31:19.000000000 +0000
+--- ./SuSE/SuSEconfig.perl.orig	2009-09-04 07:01:37.000000000 +0000
++++ ./SuSE/SuSEconfig.perl	2009-09-04 07:01:37.000000000 +0000
 @@ -0,0 +1,76 @@
 +#! /bin/bash
 +#
@@ -172,8 +172,8 @@
 +#
 +# end of file SuSEconfig.perl
 +#
---- ./SuSE/perllocal.SuSE.orig	2010-03-23 11:31:19.000000000 +0000
-+++ ./SuSE/perllocal.SuSE	2010-03-23 11:31:19.000000000 +0000
+--- ./SuSE/perllocal.SuSE.orig	2009-09-04 07:01:37.000000000 +0000
++++ ./SuSE/perllocal.SuSE	2009-09-04 07:01:37.000000000 +0000
 @@ -0,0 +1,84 @@
 +#!/usr/bin/perl
 +# Copyright (c) 1998 S.u.S.E. Gmbh Fuerth, Germany.  All rights reserved.
@@ -259,8 +259,8 @@
 +	print "SuSEconfig.perl: Can't write to file $Config{'installarchlib'}/perllocal.pod !\n\n";
 +}
 +
---- ./SuSE/sysconfig.suseconfig-perl.orig	2010-03-23 11:31:19.000000000 +0000
-+++ ./SuSE/sysconfig.suseconfig-perl	2010-03-23 11:31:19.000000000 +0000
+--- ./SuSE/sysconfig.suseconfig-perl.orig	2009-09-04 07:01:37.000000000 +0000
++++ ./SuSE/sysconfig.suseconfig-perl	2009-09-04 07:01:37.000000000 +0000
 @@ -0,0 +1,8 @@
 +## Path:	System/SuSEconfig
 +## Type:	yesno
@@ -270,42 +270,8 @@
 +# May SuSEconfig modify your perllocal.pod? (yes/no)
 +#
 +CREATE_PERLLOCAL_POD="yes"
---- ./cpan/CGI/lib/CGI/Fast.pm.orig	2010-03-23 15:04:37.000000000 +0000
-+++ ./cpan/CGI/lib/CGI/Fast.pm	2010-03-23 15:05:01.000000000 +0000
-@@ -26,6 +26,9 @@ use vars qw(
- );
- @ISA = ('CGI');
- 
-+# FCGI is missing from the perl distri
-+our $RPM_Ignore_Requires = "perl(FCGI)";
-+
- # workaround for known bug in libfcgi
- while (($ignore) = each %ENV) { }
- 
---- ./cpan/CPAN/lib/CPAN.pm.orig	2010-03-23 15:23:09.000000000 +0000
-+++ ./cpan/CPAN/lib/CPAN.pm	2010-03-23 15:23:20.000000000 +0000
-@@ -64,7 +64,7 @@ sub _uniq;
- 
- no lib ".";
- 
--require Mac::BuildTools if $^O eq 'MacOS';
-+#require Mac::BuildTools if $^O eq 'MacOS';
- if ($ENV{PERL5_CPAN_IS_RUNNING} && $$ != $ENV{PERL5_CPAN_IS_RUNNING}) {
-     $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION} ||= $ENV{PERL5_CPAN_IS_RUNNING};
-     my @rec = _uniq split(/,/, $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION}), $$;
---- ./cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm.orig	2010-03-23 15:12:55.000000000 +0000
-+++ ./cpan/CPANPLUS/lib/CPANPLUS/Internals/Constants/Report.pm	2010-03-23 15:13:29.000000000 +0000
-@@ -237,6 +237,8 @@ Thanks! :-)
- .
-                             };
- 
-+our $RPM_Ignore_Requires = "perl(Your::Module::Here)";
-+
- use constant REPORT_MISSING_TESTS
-                             => sub {
-                                 return << ".";
---- ./cpan/Compress-Raw-Zlib/config.in.orig	2010-03-23 15:01:12.000000000 +0000
-+++ ./cpan/Compress-Raw-Zlib/config.in	2010-03-23 15:02:19.000000000 +0000
+--- ./ext/Compress-Raw-Zlib/config.in.orig	2009-04-14 18:20:34.000000000 +0000
++++ ./ext/Compress-Raw-Zlib/config.in	2009-09-04 07:01:37.000000000 +0000
 @@ -16,9 +16,9 @@
  #    Setting the Gzip OS Code
  #
@@ -319,19 +285,18 @@
  
  OLD_ZLIB        = False
  GZIP_OS_CODE    = AUTO_DETECT
---- ./cpan/Cwd/lib/File/Spec/VMS.pm.orig	2010-03-23 15:10:49.000000000 +0000
-+++ ./cpan/Cwd/lib/File/Spec/VMS.pm	2010-03-23 15:11:11.000000000 +0000
-@@ -12,6 +12,8 @@ $VERSION = eval $VERSION;
- use File::Basename;
- use VMS::Filespec;
- 
-+our $RPM_Ignore_Requires = "perl(VMS::Filespec)";
-+
- =head1 NAME
- 
- File::Spec::VMS - methods for VMS file specs
---- ./cpan/Encode/bin/enc2xs.orig	2010-03-23 11:34:24.000000000 +0000
-+++ ./cpan/Encode/bin/enc2xs	2010-03-23 11:35:34.000000000 +0000
+--- ./ext/DynaLoader/hints/linux.pl.orig	2009-02-12 22:58:11.000000000 +0000
++++ ./ext/DynaLoader/hints/linux.pl	2009-09-04 07:01:37.000000000 +0000
+@@ -2,4 +2,7 @@
+ # Some Linux releases like to hide their <nlist.h>
+ $self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf'
+ 	if -f "/usr/include/libelf/nlist.h";
++# Some silly modules like mod_perl use DynaLoader.a in a shared
++# module, so add cccdlflags if we're going for a shared libperl
++$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true';
+ 1;
+--- ./ext/Encode/bin/enc2xs.orig	2009-04-12 17:18:06.000000000 +0000
++++ ./ext/Encode/bin/enc2xs	2009-09-04 07:01:37.000000000 +0000
 @@ -1005,13 +1005,13 @@ sub make_configlocal_pm {
  	    $LocalMod{$enc} ||= $mod;
  	}
@@ -348,66 +313,8 @@
      $_LocalVer = _mkversion();
      $_E2X      = find_e2x();
      $_Inc      = $INC{"Encode.pm"};
---- ./cpan/File-Temp/Temp.pm.orig	2010-03-23 15:11:55.000000000 +0000
-+++ ./cpan/File-Temp/Temp.pm	2010-03-23 15:12:16.000000000 +0000
-@@ -146,7 +146,7 @@ use File::Path qw/ rmtree /;
- use Fcntl 1.03;
- use IO::Seekable;               # For SEEK_*
- use Errno;
--require VMS::Stdio if $^O eq 'VMS';
-+#require VMS::Stdio if $^O eq 'VMS';
- 
- # pre-emptively load Carp::Heavy. If we don't when we run out of file
- # handles and attempt to call croak() we get an error message telling
---- ./cpan/Sys-Syslog/t/syslog.t.orig	2010-03-23 14:58:56.000000000 +0000
-+++ ./cpan/Sys-Syslog/t/syslog.t	2010-03-23 15:00:07.000000000 +0000
-@@ -206,6 +206,7 @@ SKIP: {
-         }
-     }
-     else  {
-+	$r = 1 unless -e '/dev/log';
-         ok( $r, "setlogsock() should return true: '$r'" );
-     }
- 
---- ./cpan/libnet/Net/Config.pm.orig	2010-03-23 15:06:09.000000000 +0000
-+++ ./cpan/libnet/Net/Config.pm	2010-03-23 15:06:27.000000000 +0000
-@@ -37,7 +37,7 @@ eval { local $SIG{__DIE__}; require Net:
- # Try to get as much configuration info as possible from InternetConfig
- #
- $^O eq 'MacOS' and eval <<TRY_INTERNET_CONFIG;
--use Mac::InternetConfig;
-+#use Mac::InternetConfig;
- 
- {
- my %nc = (
---- ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm.orig	2010-03-23 15:21:32.000000000 +0000
-+++ ./dist/ExtUtils-Install/lib/ExtUtils/Packlist.pm	2010-03-23 15:22:29.000000000 +0000
-@@ -206,8 +206,11 @@ foreach my $key (sort(keys(%{$self->{dat
-    {
-    if (! -e $key)
-       {
--      push(@missing, $key);
--      delete($self->{data}{$key}) if ($remove);
-+      if (($key !~ m!/man/!) || ! -e "$key.gz")
-+	{
-+        push(@missing, $key);
-+        delete($self->{data}{$key}) if ($remove);
-+	}
-       }
-    }
- return(@missing);
---- ./ext/DynaLoader/hints/linux.pl.orig	2009-02-08 21:40:12.000000000 +0000
-+++ ./ext/DynaLoader/hints/linux.pl	2010-03-23 11:31:19.000000000 +0000
-@@ -2,4 +2,7 @@
- # Some Linux releases like to hide their <nlist.h>
- $self->{CCFLAGS} = $Config{ccflags} . ' -I/usr/include/libelf'
- 	if -f "/usr/include/libelf/nlist.h";
-+# Some silly modules like mod_perl use DynaLoader.a in a shared
-+# module, so add cccdlflags if we're going for a shared libperl
-+$self->{CCFLAGS} = ($self->{CCFLAGS} || $Config{ccflags}) . " $Config{cccdlflags}" if $Config{'useshrplib'} eq 'true';
- 1;
---- ./ext/NDBM_File/Makefile.PL.orig	2010-01-18 18:43:45.000000000 +0000
-+++ ./ext/NDBM_File/Makefile.PL	2010-03-23 11:31:19.000000000 +0000
+--- ./ext/NDBM_File/Makefile.PL.orig	2009-04-19 17:02:38.000000000 +0000
++++ ./ext/NDBM_File/Makefile.PL	2009-09-04 07:01:37.000000000 +0000
 @@ -2,6 +2,7 @@ use ExtUtils::MakeMaker;
  WriteMakefile(
      NAME	=> 'NDBM_File',
@@ -416,8 +323,8 @@
      XSPROTOARG => '-noprototypes', 		# XXX remove later?
      VERSION_FROM => 'NDBM_File.pm',
      INC => ($^O eq "MacOS" ? "-i ::::db:include" : "")
---- ./ext/ODBM_File/Makefile.PL.orig	2010-01-18 18:43:45.000000000 +0000
-+++ ./ext/ODBM_File/Makefile.PL	2010-03-23 11:31:19.000000000 +0000
+--- ./ext/ODBM_File/Makefile.PL.orig	2009-04-19 17:02:38.000000000 +0000
++++ ./ext/ODBM_File/Makefile.PL	2009-09-04 07:01:37.000000000 +0000
 @@ -1,7 +1,7 @@
  use ExtUtils::MakeMaker;
  WriteMakefile(
@@ -427,8 +334,8 @@
      XSPROTOARG => '-noprototypes', 		# XXX remove later?
      VERSION_FROM => 'ODBM_File.pm', 
  );
---- ./ext/ODBM_File/hints/linux.pl.orig	2010-01-18 18:43:45.000000000 +0000
-+++ ./ext/ODBM_File/hints/linux.pl	2010-03-23 11:31:19.000000000 +0000
+--- ./ext/ODBM_File/hints/linux.pl.orig	2009-02-12 22:58:12.000000000 +0000
++++ ./ext/ODBM_File/hints/linux.pl	2009-09-04 07:01:37.000000000 +0000
 @@ -1,5 +1,5 @@
  # uses GDBM dbm compatibility feature - at least on SuSE 8.0
 -$self->{LIBS} = ['-lgdbm'];
@@ -436,8 +343,18 @@
  
  # Debian/Ubuntu have /usr/lib/libgdbm_compat.so.3* but not this file,
  # so linking may fail
---- ./hints/linux.sh.orig	2010-01-18 18:52:49.000000000 +0000
-+++ ./hints/linux.sh	2010-03-23 11:31:19.000000000 +0000
+--- ./ext/Sys-Syslog/t/syslog.t.orig	2009-06-10 16:53:46.000000000 +0000
++++ ./ext/Sys-Syslog/t/syslog.t	2009-09-04 07:01:37.000000000 +0000
+@@ -213,6 +213,7 @@ SKIP: {
+         }
+     }
+     else  {
++	$r = 1 unless -e '/dev/log';
+         ok( $r, "setlogsock() should return true: '$r'" );
+     }
+ 
+--- ./hints/linux.sh.orig	2009-02-12 22:58:12.000000000 +0000
++++ ./hints/linux.sh	2009-09-04 07:01:37.000000000 +0000
 @@ -50,12 +50,14 @@ ignore_versioned_solibs='y'
  # BSD compatibility library no longer needed
  # 'kaffe' has a /usr/lib/libnet.so which is not at all relevant for perl.
@@ -475,7 +392,7 @@
      libc=`ls -l /lib/libc.so.6 | awk '{print $NF}'`
      libc=/lib/$libc
  fi
-@@ -148,9 +161,14 @@ case "$optimize" in
+@@ -143,9 +156,14 @@ case "$optimize" in
              esac
          ;;
      esac
@@ -490,7 +407,7 @@
  # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
  # for this test.
  cat >try.c <<'EOM'
-@@ -235,6 +253,29 @@ EOM
+@@ -230,6 +248,29 @@ EOM
  	esac
  fi
  
@@ -509,7 +426,7 @@
 +
 +usedl='true'
 +dlsrc='dl_dlopen.xs'
-+d_dosuid='undef'
++d_dosuid='define'
 +d_bincompat3='y'
 +
 +# We don't want to add /usr/local/include and /usr/local/lib to the search
@@ -520,7 +437,7 @@
  rm -f try.c a.out
  
  if /bin/sh -c exit; then
-@@ -284,6 +325,9 @@ else
+@@ -279,6 +320,9 @@ else
  	echo "Couldn't find tcsh.  Csh-based globbing might be broken."
      fi
  fi
@@ -530,7 +447,7 @@
  
  # Shimpei Yamashita <shimpei@socrates.patnet.caltech.edu>
  # Message-Id: <33EF1634.B36B6500@pobox.com>
-@@ -362,6 +406,8 @@ $define|true|[yY]*)
+@@ -357,6 +401,8 @@ $define|true|[yY]*)
  	d_localtime_r_proto="$define"
  	d_random_r_proto="$define"
  
@@ -539,9 +456,126 @@
  	;;
  esac
  EOCBU
---- ./lib/perl5db.pl.orig	2010-01-18 18:52:49.000000000 +0000
-+++ ./lib/perl5db.pl	2010-03-23 11:31:19.000000000 +0000
-@@ -3400,6 +3400,8 @@ reading another.
+--- ./installperl.orig	2009-08-13 22:40:10.000000000 +0000
++++ ./installperl	2009-09-04 07:01:37.000000000 +0000
+@@ -235,7 +235,7 @@ if ($Is_VMS) {  # Hang in there until Fi
+ 
+ # Do some quick sanity checks.
+ 
+-if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
++#if (!$opts{notify} && $d_dosuid && $>) { die "You must run as root to install suidperl\n"; }
+ 
+    $installbin		|| die "No installbin directory in config.sh\n";
+ -d $installbin		|| mkpath($installbin, $opts{verbose}, 0777);
+@@ -344,7 +344,11 @@ else {
+ safe_unlink("$installbin/s$perl_verbase$ver$exe_ext");
+ if ($d_dosuid) {
+     copy("suidperl$exe_ext", "$installbin/s$perl_verbase$ver$exe_ext");
+-    chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
++    if ($>) {
++        chmod(0711, "$installbin/s$perl_verbase$ver$exe_ext");
++    } else {
++        chmod(04711, "$installbin/s$perl_verbase$ver$exe_ext");
++    }
+ }
+ 
+ # Install library files.
+--- ./lib/CGI/Fast.pm.orig	2009-02-12 22:58:12.000000000 +0000
++++ ./lib/CGI/Fast.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -19,6 +19,9 @@ use CGI;
+ use FCGI;
+ @ISA = ('CGI');
+ 
++# FCGI is missing from the perl distri
++our $RPM_Ignore_Requires = "perl(FCGI)";
++
+ # workaround for known bug in libfcgi
+ while (($ignore) = each %ENV) { }
+ 
+--- ./lib/CPAN.pm.orig	2009-06-27 21:21:54.000000000 +0000
++++ ./lib/CPAN.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -64,7 +64,7 @@ sub _uniq;
+ 
+ no lib ".";
+ 
+-require Mac::BuildTools if $^O eq 'MacOS';
++#require Mac::BuildTools if $^O eq 'MacOS';
+ if ($ENV{PERL5_CPAN_IS_RUNNING} && $$ != $ENV{PERL5_CPAN_IS_RUNNING}) {
+     $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION} ||= $ENV{PERL5_CPAN_IS_RUNNING};
+     my @rec = _uniq split(/,/, $ENV{PERL5_CPAN_IS_RUNNING_IN_RECURSION}), $$;
+--- ./lib/CPANPLUS/Internals/Constants/Report.pm.orig	2009-05-03 23:51:10.000000000 +0000
++++ ./lib/CPANPLUS/Internals/Constants/Report.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -236,6 +236,8 @@ Thanks! :-)
+ .
+                             };
+ 
++our $RPM_Ignore_Requires = "perl(Your::Module::Here)";
++
+ use constant REPORT_MISSING_TESTS
+                             => sub {
+                                 return << ".";
+--- ./lib/Carp/Heavy.pm.orig	2009-02-12 22:58:13.000000000 +0000
++++ ./lib/Carp/Heavy.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -30,6 +30,7 @@ $CarpInternal{warnings}++;
+ $Internal{Exporter}++;
+ $Internal{'Exporter::Heavy'}++;
+ 
++our $RPM_Ignore_Requires = "perl(Carp::Heavy)";
+ 
+ our ($CarpLevel, $MaxArgNums, $MaxEvalLen, $MaxArgLen, $Verbose);
+ 
+--- ./lib/ExtUtils/Packlist.pm.orig	2009-02-12 22:58:13.000000000 +0000
++++ ./lib/ExtUtils/Packlist.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -202,8 +202,11 @@ foreach my $key (sort(keys(%{$self->{dat
+    {
+    if (! -e $key)
+       {
+-      push(@missing, $key);
+-      delete($self->{data}{$key}) if ($remove);
++      if (($key !~ m!/man/!) || ! -e "$key.gz")
++	 {
++	 push(@missing, $key);
++	 delete($self->{data}{$key}) if ($remove);
++	 }
+       }
+    }
+ return(@missing);
+--- ./lib/File/Spec/VMS.pm.orig	2009-05-10 23:30:12.000000000 +0000
++++ ./lib/File/Spec/VMS.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -12,6 +12,8 @@ $VERSION = eval $VERSION;
+ use File::Basename;
+ use VMS::Filespec;
+ 
++our $RPM_Ignore_Requires = "perl(VMS::Filespec)";
++
+ =head1 NAME
+ 
+ File::Spec::VMS - methods for VMS file specs
+--- ./lib/File/Temp.pm.orig	2009-06-30 13:13:54.000000000 +0000
++++ ./lib/File/Temp.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -146,7 +146,7 @@ use File::Path qw/ rmtree /;
+ use Fcntl 1.03;
+ use IO::Seekable;               # For SEEK_*
+ use Errno;
+-require VMS::Stdio if $^O eq 'VMS';
++#require VMS::Stdio if $^O eq 'VMS';
+ 
+ # pre-emptively load Carp::Heavy. If we don't when we run out of file
+ # handles and attempt to call croak() we get an error message telling
+--- ./lib/Net/Config.pm.orig	2009-02-12 22:58:14.000000000 +0000
++++ ./lib/Net/Config.pm	2009-09-04 07:01:37.000000000 +0000
+@@ -37,7 +37,7 @@ eval { local $SIG{__DIE__}; require Net:
+ # Try to get as much configuration info as possible from InternetConfig
+ #
+ $^O eq 'MacOS' and eval <<TRY_INTERNET_CONFIG;
+-use Mac::InternetConfig;
++#use Mac::InternetConfig;
+ 
+ {
+ my %nc = (
+--- ./lib/perl5db.pl.orig	2009-07-25 22:36:07.000000000 +0000
++++ ./lib/perl5db.pl	2009-09-04 07:01:37.000000000 +0000
+@@ -3396,6 +3396,8 @@ reading another.
                              open( OUT, ">&STDOUT" )    # XXX: lost message
                                || &warn("Can't restore DB::OUT");
                          }
@@ -550,7 +584,7 @@
                          next CMD;
                      } ## end unless ($piped = open(OUT,...
  
-@@ -3524,6 +3526,8 @@ our standard filehandles for input and o
+@@ -3520,6 +3522,8 @@ our standard filehandles for input and o
                  # if necessary,
                  close(SAVEOUT);
                  select($selected), $selected = "" unless $selected eq "";
@@ -559,8 +593,19 @@
  
                  # No pipes now.
                  $piped = "";
---- ./locale.c.orig	2010-01-18 18:52:49.000000000 +0000
-+++ ./locale.c	2010-03-23 11:31:19.000000000 +0000
+--- ./lib/unicore/mktables.orig	2009-04-12 20:56:19.000000000 +0000
++++ ./lib/unicore/mktables	2009-09-04 07:01:37.000000000 +0000
+@@ -149,7 +149,7 @@ foreach my $lib ('To', 'lib',
+ 		 map {File::Spec->catdir("lib",$_)}
+ 		 qw(gc_sc dt bc hst ea jt lb nt ccc)) {
+   next if -d $lib;
+-  mkdir $lib, 0755 or die "mkdir '$lib': $!";
++  mkdir $lib, 0755 or $! =~ /exists/i or die "mkdir '$lib': $!";
+ }
+ 
+ my $LastUnicodeCodepoint = 0x10FFFF; # As of Unicode 5.1.
+--- ./locale.c.orig	2009-03-19 19:56:24.000000000 +0000
++++ ./locale.c	2009-09-04 07:01:37.000000000 +0000
 @@ -357,9 +357,15 @@ Perl_init_i18nl10n(pTHX_ int printwarn)
  
      if (setlocale_failure) {
@@ -577,8 +622,30 @@
  
  	if (locwarn) {
  #ifdef LC_ALL
---- ./t/op/numconvert.t.orig	2010-01-18 18:43:46.000000000 +0000
-+++ ./t/op/numconvert.t	2010-03-23 11:31:19.000000000 +0000
+--- ./t/TEST.orig	2009-08-04 22:06:15.000000000 +0000
++++ ./t/TEST	2009-09-04 07:01:37.000000000 +0000
+@@ -156,6 +156,7 @@ unless (@ARGV) {
+ 			next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar
+ 		    }
+ 		    my $path = File::Spec->catfile($updir, $t);
++		    next unless -e $path;
+ 		    push @ARGV, $path;
+ 		    $::path_to_name{$path} = $t;
+ 		}
+--- ./t/harness.orig	2009-04-19 16:47:00.000000000 +0000
++++ ./t/harness	2009-09-04 07:01:37.000000000 +0000
+@@ -199,7 +199,8 @@ if (@ARGV) {
+ 			$flat_extension =~ s!-!/!g;
+ 			next if $skip{$flat_extension}; # Foo/Bar may live in Foo-Bar
+ 		    }
+-		    push @manitests, File::Spec->catfile($updir, $test);
++		    my $t = File::Spec->catfile($updir, $test);
++		    push @manitests, $t if -e $t;
+ 		}
+ 	    }
+ 	    close MANI;
+--- ./t/op/numconvert.t.orig	2009-06-10 16:53:47.000000000 +0000
++++ ./t/op/numconvert.t	2009-09-04 07:01:37.000000000 +0000
 @@ -46,7 +46,7 @@ my $max_chain = $ENV{PERL_TEST_NUMCONVER
  
  # Bulk out if unsigned type is hopelessly wrong:
@@ -588,9 +655,9 @@
  my $big_iv = do {use integer; $max_uv1 * 16}; # 16 is an arbitrary number here
  my $max_uv_less3 = $max_uv1 - 3;
  
---- ./utils/perlbug.PL.orig	2010-03-07 17:53:22.000000000 +0000
-+++ ./utils/perlbug.PL	2010-03-23 11:31:19.000000000 +0000
-@@ -1083,6 +1083,7 @@ sub _message_headers {
+--- ./utils/perlbug.PL.orig	2009-08-12 18:49:24.000000000 +0000
++++ ./utils/perlbug.PL	2009-09-04 07:01:37.000000000 +0000
+@@ -1077,6 +1077,7 @@ sub _message_headers {
      $headers{'Cc'}         = $cc        if ($cc);
      $headers{'Message-Id'} = $messageid if ($messageid);
      $headers{'Reply-To'}   = $from      if ($from);
diff --git a/perl-5.10.1.tar.bz2 b/perl-5.10.1.tar.bz2
new file mode 100644
index 0000000..8626a20
--- /dev/null
+++ b/perl-5.10.1.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e5a2c46172b5f96de8ddfe9ed5aec5218d656a1ac48a2dae1fe58080c49b806
+size 11608186
diff --git a/perl-5.12.0-RC1.tar.bz2 b/perl-5.12.0-RC1.tar.bz2
deleted file mode 100644
index 0c490c0..0000000
--- a/perl-5.12.0-RC1.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3232e80a9f9c6afa854e346a6883650edbd45b9cae6e2feffc9f0419c8e25385
-size 12304171
diff --git a/perl-gracefull-net-ftp.diff b/perl-gracefull-net-ftp.diff
index 1f94054..caa079f 100644
--- a/perl-gracefull-net-ftp.diff
+++ b/perl-gracefull-net-ftp.diff
@@ -9,8 +9,8 @@ Command line ftp clients handle this gracefully, so should we.
 With this patch, LWP clients see a status_line of "500 This server is busy, ..."
 2006-12-20, jw@suse.de
 
---- cpan/libnet/Net/FTP.pm.orig	2007-12-18 10:47:07.000000000 +0000
-+++ cpan/libnet/Net/FTP.pm	2008-01-07 10:08:30.000000000 +0000
+--- lib/Net/FTP.pm.orig	2007-12-18 10:47:07.000000000 +0000
++++ lib/Net/FTP.pm	2008-01-07 10:08:30.000000000 +0000
 @@ -107,7 +107,7 @@ sub new {
  
    unless ($ftp->response() == CMD_OK) {
@@ -38,8 +38,8 @@ With this patch, LWP clients see a status_line of "500 This server is busy, ..."
  
    (${*$ftp}{'net_cmd_code'}, 1);
  }
---- cpan/libnet/Net/Cmd.pm.orig	2007-12-18 10:47:07.000000000 +0000
-+++ cpan/libnet/Net/Cmd.pm	2008-01-07 10:09:34.000000000 +0000
+--- lib/Net/Cmd.pm.orig	2007-12-18 10:47:07.000000000 +0000
++++ lib/Net/Cmd.pm	2008-01-07 10:09:34.000000000 +0000
 @@ -353,6 +353,7 @@ sub response {
      ($code, $more) = $cmd->parse_response($str);
      unless (defined $code) {
diff --git a/perl-netcmdutf8.diff b/perl-netcmdutf8.diff
index 6bccf72..2cda2a5 100644
--- a/perl-netcmdutf8.diff
+++ b/perl-netcmdutf8.diff
@@ -1,5 +1,5 @@
---- ./cpan/libnet/Net/Cmd.pm.orig	2009-09-03 14:32:13.000000000 +0000
-+++ ./cpan/libnet/Net/Cmd.pm	2009-09-03 14:47:30.000000000 +0000
+--- ./lib/Net/Cmd.pm.orig	2009-09-03 14:32:13.000000000 +0000
++++ ./lib/Net/Cmd.pm	2009-09-03 14:47:30.000000000 +0000
 @@ -226,6 +226,10 @@ sub command {
      $str = $cmd->toascii($str) if $tr;
      $str .= "\015\012";
diff --git a/perl-nroff.diff b/perl-nroff.diff
index ee63f3e..c7a194b 100644
--- a/perl-nroff.diff
+++ b/perl-nroff.diff
@@ -1,6 +1,6 @@
---- dist/Pod-Perldoc/lib/Pod/Perldoc.pm.orig	2010-02-17 14:35:24.000000000 +0000
-+++ dist/Pod-Perldoc/lib/Pod/Perldoc.pm	2010-03-23 15:40:17.000000000 +0000
-@@ -655,7 +655,7 @@ sub options_processing {
+--- ./lib/Pod/Perldoc.pm.orig	2009-01-14 14:57:51.000000000 +0000
++++ ./lib/Pod/Perldoc.pm	2009-01-14 14:58:15.000000000 +0000
+@@ -648,7 +648,7 @@ sub options_processing {
  
      $self->options_sanity;
  
@@ -8,4 +8,4 @@
 +    $self->opt_n("nroff -c") unless $self->opt_n;
      $self->add_formatter_option( '__nroffer' => $self->opt_n );
  
-     # Get language from PERLDOC_POD2 environment variable
+     # Adjust for using translation packages
diff --git a/perl-regexp-refoverflow.diff b/perl-regexp-refoverflow.diff
index 50563d2..5544ca8 100644
--- a/perl-regexp-refoverflow.diff
+++ b/perl-regexp-refoverflow.diff
@@ -1,6 +1,6 @@
---- regcomp.c.orig	2010-02-28 20:12:22.000000000 +0000
-+++ regcomp.c	2010-03-23 15:38:55.000000000 +0000
-@@ -5818,7 +5818,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I
+--- ./regcomp.c.orig	2009-07-27 21:37:52.000000000 +0000
++++ ./regcomp.c	2009-09-03 14:36:50.000000000 +0000
+@@ -5787,7 +5787,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I
  
                  ret = reganode(pRExC_state, GOSUB, num);
                  if (!SIZE_ONLY) {
@@ -9,7 +9,7 @@
  			RExC_parse++;
  			vFAIL("Reference to nonexistent group");
  	            }
-@@ -7260,7 +7260,7 @@ tryagain:
+@@ -7234,7 +7234,7 @@ tryagain:
                      if (num < 1)
                          vFAIL("Reference to nonexistent or unclosed group");
                  }
@@ -18,7 +18,7 @@
  		    goto defchar;
  		else {
  		    char * const parse_start = RExC_parse - 1; /* MJD */
-@@ -7274,7 +7274,7 @@ tryagain:
+@@ -7248,7 +7248,7 @@ tryagain:
                          RExC_parse++;
                      }    
  		    if (!SIZE_ONLY) {
@@ -27,7 +27,7 @@
  			    vFAIL("Reference to nonexistent group");
  		    }
  		    RExC_sawback = 1;
-@@ -7451,7 +7451,7 @@ tryagain:
+@@ -7425,7 +7425,7 @@ tryagain:
  		    case '0': case '1': case '2': case '3':case '4':
  		    case '5': case '6': case '7': case '8':case '9':
  			if (*p == '0' ||
diff --git a/perl-threads.diff b/perl-threads.diff
new file mode 100644
index 0000000..e277f13
--- /dev/null
+++ b/perl-threads.diff
@@ -0,0 +1,29 @@
+--- ext/threads/threads.xs.orig	2009-09-04 06:58:42.000000000 +0000
++++ ext/threads/threads.xs	2009-09-04 07:00:10.000000000 +0000
+@@ -603,8 +603,10 @@ S_ithread_create(
+     ithread     *thread;
+     ithread     *current_thread = S_ithread_get(aTHX);
+ 
++#if 0
+     SV         **tmps_tmp = PL_tmps_stack;
+     IV           tmps_ix  = PL_tmps_ix;
++#endif
+ #ifndef WIN32
+     int          rc_stack_size = 0;
+     int          rc_thread_create = 0;
+@@ -695,6 +697,7 @@ S_ithread_create(
+         thread->params = sv_dup(params, &clone_param);
+         SvREFCNT_inc_void(thread->params);
+ 
++#if 0
+         /* The code below checks that anything living on the tmps stack and
+          * has been cloned (so it lives in the ptr_table) has a refcount
+          * higher than 0.
+@@ -717,6 +720,7 @@ S_ithread_create(
+                 SvREFCNT_dec(sv);
+             }
+         }
++#endif
+ 
+         SvTEMP_off(thread->init_function);
+         ptr_table_free(PL_ptr_table);
diff --git a/perl.changes b/perl.changes
index 27b7faf..3f851dc 100644
--- a/perl.changes
+++ b/perl.changes
@@ -1,20 +1,3 @@
--------------------------------------------------------------------
-Wed Mar 31 19:24:32 CEST 2010 - mls@suse.de
-
-- update to perl-5.12.0-RC1
-  * mostly documentation updates
-  * some regression fixes
-
--------------------------------------------------------------------
-Wed Mar 24 14:05:46 CET 2010 - mls@suse.de
-
-- update to perl-5.12.0-RC0
-  * new ... operator
-  * unicode improvements
-  * "each" now also works on arrays
-  * support for "delete local"
-  * suidperl was dropped
-
 -------------------------------------------------------------------
 Fri Feb 12 10:53:11 UTC 2010 - chris@computersalat.de
 
diff --git a/perl.spec b/perl.spec
index 3ad86aa..8f92f22 100644
--- a/perl.spec
+++ b/perl.spec
@@ -20,24 +20,24 @@
 
 Name:           perl
 Summary:        The Perl interpreter
-Version:        5.11.99.RC1
-%define pversion 5.12.0
+Version:        5.10.1
 Release:        5
 License:        Artistic License .. ; GPLv2+
 Group:          Development/Languages/Perl
 AutoReqProv:    on
 Url:            http://www.perl.org/
-Source:         perl-5.12.0-RC1.tar.bz2
+Source:         perl-%{version}.tar.bz2
 Source1:        %name-rpmlintrc
 Source2:        macros.perl
 Source3:        README.macros
 Source4:        baselibs.conf
-Patch0:         perl-%{pversion}.dif
+Patch0:         perl-%{version}.dif
 Patch1:         perl-gracefull-net-ftp.diff
 Patch2:         perl-fix_dbmclose_call.patch
 Patch3:         perl-regexp-refoverflow.diff
 Patch4:         perl-nroff.diff
 Patch5:         perl-netcmdutf8.diff
+Patch6:         perl-threads.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         perl-base = %version
 #PreReq:         %fillup_prereq
@@ -45,10 +45,6 @@ BuildRequires:  db-devel gdbm-devel libbz2-devel ncurses-devel zlib-devel
 #Requires:       gzip	# needed in SuSEconfig.perl
 Recommends:     perl-doc = %version
 #
-%if "%version" != "%pversion"
-Provides:       perl = %pversion-%release
-%endif
-Provides:       perl(:MODULE_COMPAT_%pversion)
 Provides:       perl-500
 Provides:       perl-macros
 Obsoletes:      perl-macros
@@ -137,7 +133,7 @@ Authors:
     Larry Wall, Louis J. LaBash, Jr. <llabash@siue.edu>
 
 %prep
-%setup -q -n perl-5.12.0-RC1
+%setup -q -n perl-5.10.1
 cp -p %{S:3} .
 %patch0
 %patch1
@@ -145,9 +141,9 @@ cp -p %{S:3} .
 %patch3
 %patch4
 %patch5
+%patch6
 
 %build
-cp -a lib savelib
 export SUSE_ASNEEDED=0
 export BZIP2_LIB=%{_libdir}
 export BZIP2_INCLUDE=%{_includedir}
@@ -165,19 +161,20 @@ options="$options -Accflags='-DPERL_USE_SAFE_PUTENV'"
 chmod 755 ./configure.gnu
 ./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm -Duseshrplib=\'true\' $options
 make %{?jobs:-j%jobs};
-cp -p libperl.so savelibperl.so
-cp -p lib/Config.pm saveConfig.pm
-cp -p lib/Config_heavy.pl saveConfig_heavy.pl
-make clean > /dev/null
+mv libperl.so savelibperl.so
+mv lib/Config.pm saveConfig.pm
+mv lib/Config_heavy.pl saveConfig_heavy.pl
 make clobber
-rm -rf lib
-mv savelib lib
 ./configure.gnu --prefix=/usr -Dvendorprefix=/usr -Dinstallusrbinperl -Dusethreads -Di_db -Di_dbm -Di_ndbm -Di_gdbm $options
 make %{?jobs:-j%jobs};
+%ifnarch %arm
 
 %check
-%ifnarch %arm
 export SUSE_ASNEEDED=0
+# delete broken File::Find test
+rm -f lib/File/Find/t/find.t
+# delete racy test
+rm -f t/op/getppid.t
 make test
 %endif
 
@@ -221,7 +218,7 @@ rm $RPM_BUILD_ROOT/usr/lib/perl5/*/*/CORE/libperl.a
 $RPM_BUILD_ROOT/usr/bin/perl -e '$r=chr(128)."\\x{100}";/$r/'
 # test perl-regexp-refoverflow.diff
 $RPM_BUILD_ROOT/usr/bin/perl -e '/\6666666666/'
-%if 0
+%if 1
 # remove unrelated target/os manpages
 rm $RPM_BUILD_ROOT/usr/share/man/man1/perlaix.1*
 rm $RPM_BUILD_ROOT/usr/share/man/man1/perlamiga.1*
@@ -256,81 +253,81 @@ rm $RPM_BUILD_ROOT/usr/share/man/man1/perlvos.1*
 rm $RPM_BUILD_ROOT/usr/share/man/man1/perlwin32.1*
 %endif
 cat << EOF > perl-base-filelist
-/usr/lib/perl5/%pversion/B/Deparse.pm
-/usr/lib/perl5/%pversion/Carp.pm
-/usr/lib/perl5/%pversion/Carp/
-/usr/lib/perl5/%pversion/Class/
-/usr/lib/perl5/%pversion/Config/
-/usr/lib/perl5/%pversion/Digest.pm
-/usr/lib/perl5/%pversion/Digest/
-/usr/lib/perl5/%pversion/Exporter.pm
-/usr/lib/perl5/%pversion/Exporter/
-/usr/lib/perl5/%pversion/File/
-/usr/lib/perl5/%pversion/Getopt/
-/usr/lib/perl5/%pversion/IPC/
-/usr/lib/perl5/%pversion/Text/
-/usr/lib/perl5/%pversion/Tie/Hash.pm
-/usr/lib/perl5/%pversion/XSLoader.pm
-/usr/lib/perl5/%pversion/warnings.pm
-/usr/lib/perl5/%pversion/warnings/
-/usr/lib/perl5/%pversion/AutoLoader.pm
-/usr/lib/perl5/%pversion/FileHandle.pm
-/usr/lib/perl5/%pversion/SelectSaver.pm
-/usr/lib/perl5/%pversion/Symbol.pm
-/usr/lib/perl5/%pversion/base.pm
-/usr/lib/perl5/%pversion/bytes.pm
-/usr/lib/perl5/%pversion/bytes_heavy.pl
-/usr/lib/perl5/%pversion/constant.pm
-/usr/lib/perl5/%pversion/fields.pm
-/usr/lib/perl5/%pversion/feature.pm
-/usr/lib/perl5/%pversion/integer.pm
-/usr/lib/perl5/%pversion/locale.pm
-/usr/lib/perl5/%pversion/overload.pm
-/usr/lib/perl5/%pversion/strict.pm
-/usr/lib/perl5/%pversion/utf8.pm
-/usr/lib/perl5/%pversion/utf8_heavy.pl
-/usr/lib/perl5/%pversion/vars.pm
-/usr/lib/perl5/%pversion/version.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Data/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Digest/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/File/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/List/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Scalar/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Dir.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/File.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Handle.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Pipe.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Poll.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Seekable.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Select.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Socket.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/IO/Socket/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/B.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Config.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Config_heavy.pl
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Cwd.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/DynaLoader.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Errno.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Fcntl.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/POSIX.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/Socket.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/attributes.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Data/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Digest/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Fcntl/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/File/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/IO/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/List/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Cwd/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/DynaLoader/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/Socket/
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/POSIX.bs
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/POSIX.so
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/autosplit.ix
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX/load_imports.al
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/lib.pm
-/usr/lib/perl5/%pversion/*-linux-thread-multi*/re.pm
+/usr/lib/perl5/%version/Carp.pm
+/usr/lib/perl5/%version/Carp/
+/usr/lib/perl5/%version/Class/
+/usr/lib/perl5/%version/Config/
+/usr/lib/perl5/%version/Digest.pm
+/usr/lib/perl5/%version/Digest/
+/usr/lib/perl5/%version/Exporter.pm
+/usr/lib/perl5/%version/Exporter/
+/usr/lib/perl5/%version/File/
+/usr/lib/perl5/%version/Getopt/
+/usr/lib/perl5/%version/IPC/
+/usr/lib/perl5/%version/Text/
+/usr/lib/perl5/%version/Tie/Hash.pm
+/usr/lib/perl5/%version/warnings.pm
+/usr/lib/perl5/%version/warnings/
+/usr/lib/perl5/%version/AutoLoader.pm
+/usr/lib/perl5/%version/FileHandle.pm
+/usr/lib/perl5/%version/SelectSaver.pm
+/usr/lib/perl5/%version/Symbol.pm
+/usr/lib/perl5/%version/attributes.pm
+/usr/lib/perl5/%version/base.pm
+/usr/lib/perl5/%version/bytes.pm
+/usr/lib/perl5/%version/bytes_heavy.pl
+/usr/lib/perl5/%version/constant.pm
+/usr/lib/perl5/%version/fields.pm
+/usr/lib/perl5/%version/feature.pm
+/usr/lib/perl5/%version/integer.pm
+/usr/lib/perl5/%version/locale.pm
+/usr/lib/perl5/%version/overload.pm
+/usr/lib/perl5/%version/strict.pm
+/usr/lib/perl5/%version/utf8.pm
+/usr/lib/perl5/%version/utf8_heavy.pl
+/usr/lib/perl5/%version/vars.pm
+/usr/lib/perl5/%version/version.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/Data/
+/usr/lib/perl5/%version/*-linux-thread-multi*/Digest/
+/usr/lib/perl5/%version/*-linux-thread-multi*/File/
+/usr/lib/perl5/%version/*-linux-thread-multi*/List/
+/usr/lib/perl5/%version/*-linux-thread-multi*/Scalar/
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Dir.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/File.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Handle.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Pipe.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Poll.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Seekable.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Select.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Socket.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/IO/Socket/
+/usr/lib/perl5/%version/*-linux-thread-multi*/B.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/B/Deparse.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/Config.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/Config_heavy.pl
+/usr/lib/perl5/%version/*-linux-thread-multi*/Cwd.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/DynaLoader.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/Errno.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/Fcntl.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/POSIX.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/Socket.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/XSLoader.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Data/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Digest/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Fcntl/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/File/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/IO/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/List/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Cwd/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/DynaLoader/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/Socket/
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/POSIX.bs
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/POSIX.so
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/autosplit.ix
+/usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX/load_imports.al
+/usr/lib/perl5/%version/*-linux-thread-multi*/lib.pm
+/usr/lib/perl5/%version/*-linux-thread-multi*/re.pm
 EOF
 {
   sed -e 's/^/%%exclude /' perl-base-filelist
@@ -347,19 +344,21 @@ EOF
 %files base -f perl-base-filelist
 %defattr(-,root,root)
 %dir /usr/lib/perl5
-%dir /usr/lib/perl5/%pversion
-%dir /usr/lib/perl5/%pversion/B
-%dir /usr/lib/perl5/%pversion/*-linux-thread-multi*
-%dir /usr/lib/perl5/%pversion/*-linux-thread-multi*/auto
-%dir /usr/lib/perl5/%pversion/*-linux-thread-multi*/auto/POSIX
+%dir /usr/lib/perl5/%version
+%dir /usr/lib/perl5/%version/*-linux-thread-multi*
+%dir /usr/lib/perl5/%version/*-linux-thread-multi*/auto
+%dir /usr/lib/perl5/%version/*-linux-thread-multi*/B
+%dir /usr/lib/perl5/%version/*-linux-thread-multi*/auto/POSIX
 /usr/bin/perl
-/usr/bin/perl%pversion
+/usr/bin/perl%version
+/usr/bin/suidperl
 %doc /usr/share/man/man1/perl.1.gz
 
 %files -f perl-base-excludes 
 %defattr(-,root,root)
 %exclude /usr/bin/perl
-%exclude /usr/bin/perl%pversion
+%exclude /usr/bin/perl%version
+%exclude /usr/bin/suidperl
 %exclude /usr/lib/perl5/*/Unicode/*/*.txt
 %exclude /usr/lib/perl5/*/unicore/*.txt
 /usr/bin/*