rpms/perl/F-9 perl.spec,1.178,1.179

[Štěpán Kasal (kasal)]

Author: kasal

Update of /cvs/extras/rpms/perl/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11742

Modified Files:
	perl.spec 
Log Message:
- Add compatibility paths to otherlibdirs (fixes 457771)


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-9/perl.spec,v
retrieving revision 1.178
retrieving revision 1.179
diff -u -r1.178 -r1.179
--- perl.spec	30 Jul 2008 07:15:42 -0000	1.178
+++ perl.spec	7 Aug 2008 08:57:27 -0000	1.179
@@ -16,7 +16,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        32%{?dist}
+Release:        33%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -876,6 +876,10 @@
 # Because of the typo in the first F-9 release, we have to support the default
 # sitedir as well for 32bit archs, via -Dotherlibdirs.  No need to mention the
 # arch-specific subdir though, perl will add it, if it exists.
+%ifnarch %{multilib_64_archs}
+#	-Dotherlibdirs="%{_prefix}/lib/perl5/site_perl/%{perl_version}" \
+%endif
+# ... but this is superceded by our more general compatibility -Dotherlibdirs.
 
 /bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS -DPERL_USE_SAFE_PUTENV" \
         -Dversion=%{perl_version} \
@@ -894,9 +898,8 @@
         -Darchname=%{perl_archname} \
 %ifarch %{multilib_64_archs}
         -Dlibpth="/usr/local/lib64 /lib64 %{_prefix}/lib64" \
-%else
-	-Dotherlibdirs="%{_prefix}/lib/perl5/site_perl/%{perl_version}" \
 %endif
+	-Dotherlibdirs="%{_prefix}/local/lib/perl5/site_perl:%{_prefix}/lib/perl5/site_perl" \
 %ifarch sparc sparcv9
         -Ud_longdbl \
 %endif
@@ -948,7 +951,7 @@
 %endif
 %endif
 
-# perl doesn't create this module, but modules put things in it, so we need to own it.
+# perl doesn't create this directory, but modules put things in it, so we need to own it.
 mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_libdir}/perl5/vendor_perl/%{perl_version}/%{perl_archname}/auto
 
 install -p -m 755 utils/pl2pm ${RPM_BUILD_ROOT}%{_bindir}/pl2pm
@@ -959,17 +962,6 @@
               -d $RPM_BUILD_ROOT%{_libdir}/perl5/%{perl_version}/%{perl_archname} $i || /bin/true
 done
 
-
-for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^%{_prefix}/lib')
-do
-  mkdir -p $RPM_BUILD_ROOT/$dir
-done
-
-for dir in $(%{new_perl} -le 'print join("\n", @INC)' | grep '^%{_libdir}')
-do
-  mkdir -p $RPM_BUILD_ROOT/$dir
-done
-
 #
 # libnet configuration file
 #
@@ -1646,6 +1638,9 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Wed Aug  6 2008 Stepan Kasal <skasal at redhat.com> 4:5.10.0-33.fc9
+- Add compatibility paths to otherlibdirs (fixes 457771)
+
 * Wed Jul 30 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-32.fc9
 - 457085 CGI.pm bug in exists() on tied param hash