re-order @INC to allow for site_perl and vendor_perl to override built-in

perl modules

perl-5.8.5-incorder.patch

@@ -0,0 +1,46 @@
+--- perl-5.8.5/perl.c.incorder	2005-03-08 16:11:32.722330404 -0500
++++ perl-5.8.5/perl.c	2005-03-08 16:12:04.738580672 -0500
+@@ -4287,9 +4287,6 @@
+     incpush(APPLLIB_EXP, TRUE, TRUE, TRUE);
+ #endif
+ 
+-#ifdef ARCHLIB_EXP
+-    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
+-#endif
+ #ifdef MACOS_TRADITIONAL
+     {
+ 	Stat_t tmpstatbuf;
+@@ -4311,14 +4308,6 @@
+     if (!PL_tainting)
+ 	incpush(":", FALSE, FALSE, TRUE);
+ #else
+-#ifndef PRIVLIB_EXP
+-#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
+-#endif
+-#if defined(WIN32)
+-    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
+-#else
+-    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
+-#endif
+ 
+ #ifdef SITEARCH_EXP
+     /* sitearch is always relative to sitelib on Windows for
+@@ -4367,6 +4356,18 @@
+     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE);
+ #endif
+ 
++#ifdef ARCHLIB_EXP
++    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE);
++#endif
++#ifndef PRIVLIB_EXP
++#  define PRIVLIB_EXP "/usr/local/lib/perl5:/usr/local/lib/perl"
++#endif
++#if defined(WIN32)
++    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE);
++#else
++    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE);
++#endif
++
+     if (!PL_tainting)
+ 	incpush(".", FALSE, FALSE, TRUE);
+ #endif /* MACOS_TRADITIONAL */

perl.spec

@@ -5,7 +5,7 @@
 %define multilib_64_archs x86_64 s390x ppc64 sparc64
 
 %define perlver 5.8.6
-%define perlrel 3
+%define perlrel 4
 %define perlepoch 3
 
 Provides: perl(:WITH_PERLIO)
@@ -61,6 +61,7 @@ Patch11: perl-5.8.3-fullinc.patch
 Patch12: perl-5.8.6-incpush.patch
 Patch13: perl-5.8.3-perlbug-tag.patch
 Patch14: perl-5.8.5-dashI.patch
+Patch15: perl-5.8.5-incorder.patch
 
 %define __perl_requires %{SOURCE11}
 
@@ -210,6 +211,7 @@ more secure running of setuid perl scripts.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %patch17 -p1
 
@@ -412,6 +414,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Tue Mar  8 2005 Chip Turner <cturner@redhat.com> - 3:5.8.6-4
+- add patch to put site_perl and vendor_perl before core perl dirs, to
+  allow for overriding modules
+
 * Sat Jan 29 2005 Warren Togami <wtogami@redhat.com> - 3:5.8.6-3
 - bugzilla: 127025, fix strip warnings