Corrected perl include module handling by modifying the $version variable before building the proxy perl script.

perl-curses/perl-curses.spec

@@ -38,8 +38,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EXP]
 Group:        Language
 License:      GPL/Artistic
-Version:      20020227
-Release:      20020227
+Version:      20020515
+Release:      20020515
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/Curses/Curses-%{V_curses}.tar.gz
@@ -78,15 +78,15 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man3
 
     #   create a wrapper script which finds the includes
-    eval `$perl -V:archname`
+    eval `%{l_prefix}/bin/perl -V:version -V:archname`
     perl=$RPM_BUILD_ROOT/perl
     echo "#!/bin/sh" >$perl
     echo "exec %{l_prefix}/bin/perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
     echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
     echo " \"\$@\"" >>$perl
     chmod a+x $perl
 

perl-db/perl-db.spec

@@ -37,8 +37,8 @@ Packager:     The OpenPKG Project
 Distribution: OpenPKG [EXP]
 Group:        Language
 License:      GPL/Artistic
-Version:      20020315
-Release:      20020315
+Version:      20020515
+Release:      20020515
 
 #   list of sources
 Source0:      http://www.cpan.org/modules/by-module/BerkeleyDB/BerkeleyDB-%{V_berkeleydb}.tar.gz
@@ -73,15 +73,15 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man3
 
     #   create a wrapper script which finds the includes
-    eval `$perl -V:archname`
+    eval `%{l_prefix}/bin/perl -V:version -V:archname`
     perl=$RPM_BUILD_ROOT/perl
     echo "#!/bin/sh" >$perl
     echo "exec %{l_prefix}/bin/perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
     echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
     echo " \"\$@\"" >>$perl
     chmod a+x $perl
 

perl-gd/perl-gd.spec

@@ -105,15 +105,15 @@ AutoReqProv:  no
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/lib/perl5
 
     #   create a wrapper script which finds the includes
-    eval `$perl -V:archname`
+    eval `%{l_prefix}/bin/perl -V:version -V:archname`
     perl=$RPM_BUILD_ROOT/perl
     echo "#!/bin/sh" >$perl
     echo "exec %{l_prefix}/bin/perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
     echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
     echo " \"\$@\"" >>$perl
     chmod a+x $perl
 

perl-ssl/perl-ssl.spec

@@ -65,7 +65,19 @@ AutoReqProv:  no
     rm -rf $RPM_BUILD_ROOT
     %{l_shtool} mkdir -f -p -m 755 $RPM_BUILD_ROOT%{l_prefix}/lib/perl5
 
-    perl=%{l_prefix}/bin/perl
+    #   create a wrapper script which finds the includes
+    eval `%{l_prefix}/bin/perl -V:version -V:archname`
+    perl=$RPM_BUILD_ROOT/perl
+    echo "#!/bin/sh" >$perl
+    echo "exec %{l_prefix}/bin/perl \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
+    echo " \"\$@\"" >>$perl
+    chmod a+x $perl
+
     for mod in %{SOURCE0} %{SOURCE1}; do
         %{l_gzip} -dc $mod | %{l_tar} xf -
         dir=`echo "$mod" | sed -e 's;^.*/\([^/]*\)\.tar\.gz$;\1;'`

perl-term/perl-term.spec

@@ -85,15 +85,15 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man3
 
     #   create a wrapper script which finds the includes
-    eval `$perl -V:archname`
+    eval `%{l_prefix}/bin/perl -V:version -V:archname`
     perl=$RPM_BUILD_ROOT/perl
     echo "#!/bin/sh" >$perl
     echo "exec %{l_prefix}/bin/perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
     echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
     echo " \"\$@\"" >>$perl
     chmod a+x $perl
 

perl-time/perl-time.spec

@@ -81,15 +81,15 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man3
 
     #   create a wrapper script which finds the includes
-    eval `$perl -V:archname`
+    eval `%{l_prefix}/bin/perl -V:version -V:archname`
     perl=$RPM_BUILD_ROOT/perl
     echo "#!/bin/sh" >$perl
     echo "exec %{l_prefix}/bin/perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
     echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
     echo " \"\$@\"" >>$perl
     chmod a+x $perl
 

perl-www/perl-www.spec

@@ -73,15 +73,15 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man3
 
     #   create a wrapper script which finds the includes
-    eval `$perl -V:archname`
+    eval `%{l_prefix}/bin/perl -V:version -V:archname`
     perl=$RPM_BUILD_ROOT/perl
     echo "#!/bin/sh" >$perl
     echo "exec %{l_prefix}/bin/perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/${version}/${archname} \\" >>$perl
     echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version} \\" >>$perl
-    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/%{version}/${archname} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version} \\" >>$perl
+    echo " -I$RPM_BUILD_ROOT%{l_prefix}/lib/perl5/site_perl/${version}/${archname} \\" >>$perl
     echo " \"\$@\"" >>$perl
     chmod a+x $perl