[perl/f13/master] * Thu Aug 12 2010 Marcela Mašláňová <mmaslano at redhat.com> - 4:5.10.1-117.1 - 622896 remove path

[Marcela Mašláňová]

commit 10d6af3eb77c199416d8ddbbebfad4c77d979288
Author: Marcela Mašláňová <mmaslano at redhat.com>
Date:   Thu Aug 12 21:13:20 2010 +0200

    * Thu Aug 12 2010  Marcela Mašláňová <mmaslano at redhat.com> - 4:5.10.1-117.1
    - 622896 remove paths, which were in INC duplicated. The rest of duplicated
     must be here because it's always different macro: privlib/vendorlib.

 perl-5.10.0-reorderINC.patch |   43 ++++++++++++++++++++++++++++++-----------
 perl.spec                    |    7 +++--
 2 files changed, 35 insertions(+), 15 deletions(-)
---
diff --git a/perl-5.10.0-reorderINC.patch b/perl-5.10.0-reorderINC.patch
index 1f1a94b..5928f5d 100644
--- a/perl-5.10.0-reorderINC.patch
+++ b/perl-5.10.0-reorderINC.patch
@@ -1,7 +1,6 @@
-diff -up perl-5.10.0/perl.c.BAD perl-5.10.0/perl.c
---- perl-5.10.0/perl.c.BAD	2009-03-09 09:55:05.000000000 -0400
-+++ perl-5.10.0/perl.c	2009-03-09 10:00:41.000000000 -0400
-@@ -4753,9 +4753,6 @@ S_init_perllib(pTHX)
+--- perl-5.10.1/perl.c.doub	2009-04-22 20:07:41.000000000 +0200
++++ perl-5.10.1/perl.c	2010-08-12 19:48:26.000000000 +0200
+@@ -4879,9 +4879,6 @@
      incpush(APPLLIB_EXP, TRUE, TRUE, TRUE, TRUE);
  #endif
  
@@ -11,7 +10,7 @@ diff -up perl-5.10.0/perl.c.BAD perl-5.10.0/perl.c
  #ifdef MACOS_TRADITIONAL
      {
  	Stat_t tmpstatbuf;
-@@ -4764,6 +4761,10 @@ S_init_perllib(pTHX)
+@@ -4890,6 +4887,10 @@
  	
  	if (!macperl)
  	    macperl = "";
@@ -22,7 +21,7 @@ diff -up perl-5.10.0/perl.c.BAD perl-5.10.0/perl.c
  	
  	Perl_sv_setpvf(aTHX_ privdir, "%slib:", macperl);
  	if (PerlLIO_stat(SvPVX(privdir), &tmpstatbuf) >= 0 && S_ISDIR(tmpstatbuf.st_mode))
-@@ -4777,14 +4778,6 @@ S_init_perllib(pTHX)
+@@ -4903,14 +4904,6 @@
      if (!PL_tainting)
  	incpush(":", FALSE, FALSE, TRUE, FALSE);
  #else
@@ -37,10 +36,32 @@ diff -up perl-5.10.0/perl.c.BAD perl-5.10.0/perl.c
  
  #ifdef SITEARCH_EXP
      /* sitearch is always relative to sitelib on Windows for
-@@ -4828,6 +4821,19 @@ S_init_perllib(pTHX)
-     incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
+@@ -4929,10 +4922,11 @@
+ #  endif
  #endif
  
+-#if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)
+-    /* Search for version-specific dirs below here */
+-    incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
+-#endif
++/* This duplicates path     /usr/local/share/perl5
++ * #if defined(SITELIB_STEM) && defined(PERL_INC_VERSION_LIST)*/
++/* Search for version-specific dirs below here */
++/*    incpush(SITELIB_STEM, FALSE, TRUE, TRUE, TRUE);
++#endif*/
+ 
+ #ifdef PERL_VENDORARCH_EXP
+     /* vendorarch is always relative to vendorlib on Windows for
+@@ -4950,8 +4944,21 @@
+ #  endif
+ #endif
+ 
+-#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
+-    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
++/*#ifdef PERL_VENDORLIB_STEM /* Search for version-specific dirs below here */
++/*    incpush(PERL_VENDORLIB_STEM, FALSE, TRUE, TRUE, TRUE);
++#endif*/
++
 +#ifdef ARCHLIB_EXP
 +    incpush(ARCHLIB_EXP, FALSE, FALSE, TRUE, TRUE);
 +#endif
@@ -52,8 +73,6 @@ diff -up perl-5.10.0/perl.c.BAD perl-5.10.0/perl.c
 +    incpush(PRIVLIB_EXP, TRUE, FALSE, TRUE, TRUE);
 +#else
 +    incpush(PRIVLIB_EXP, FALSE, FALSE, TRUE, TRUE);
-+#endif
-+
- #ifdef PERL_OTHERLIBDIRS
-     incpush(PERL_OTHERLIBDIRS, TRUE, TRUE, TRUE, TRUE);
  #endif
+ 
+ #ifdef PERL_OTHERLIBDIRS
diff --git a/perl.spec b/perl.spec
index 1630b88..2ba2f25 100644
--- a/perl.spec
+++ b/perl.spec
@@ -1036,9 +1036,6 @@ echo "RPM Build arch: %{_arch}"
         -Dscriptdir='%{_bindir}' \
         -Dotherlibdirs="%{old_sitearch}:%{old_sitelib}:%{old_vendorarch}:%{old_vendorlib}:/usr/lib/perl5/site_perl"
 
-# this is promised to stay forever:
-#        -Dotherlibdirs=%{prefix}/lib/perl5/site_perl
-
 
 %ifarch sparc64
 make
@@ -1807,6 +1804,10 @@ rm -rf $RPM_BUILD_ROOT
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Thu Aug 12 2010  Marcela Mašláňová <mmaslano at redhat.com> - 4:5.10.1-117.1
+- 622896 remove paths, which were in INC duplicated. The rest of duplicated
+ must be here because it's always different macro: privlib/vendorlib.
+
 * Mon Jul 26 2010 Petr Pisar <ppisar at redhat.com> - 4:5.10.1-117
 - Enable parallel testing in IO module
 - Run tests in C locale to pass t/op/stat.t test in localized environment