rpms/perl/F-9 perl.spec,1.169,1.170

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

Author: kasal

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

Modified Files:
	perl.spec 
Log Message:
- make config parameter list consistent for 32bit and 64bit platforms,
  add config option -Dinc_version_list=none (#448735)
- use perl_archname consistently
- set siteprefix to prefix/local


Index: perl.spec
===================================================================
RCS file: /cvs/extras/rpms/perl/F-9/perl.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- perl.spec	11 Jun 2008 13:35:14 -0000	1.169
+++ perl.spec	12 Jun 2008 10:32:05 -0000	1.170
@@ -16,7 +16,7 @@
 
 Name:           perl
 Version:        %{perl_version}
-Release:        25%{?dist}
+Release:        26%{?dist}
 Epoch:          %{perl_epoch}
 Summary:        The Perl programming language
 Group:          Development/Languages
@@ -856,9 +856,7 @@
 %build
 echo "RPM Build arch: %{_arch}"
 
-# yes; don't use %_libdir so that noarch packages from other OSs
-# arches work correctly :\ the Configure lines below hardcode lib for
-# similar reasons.
+# use "lib", not %{_lib}, for privlib, sitelib, and vendorlib
 
 /bin/sh Configure -des -Doptimize="$RPM_OPT_FLAGS" \
         -Dversion=%{perl_version} \
@@ -870,19 +868,19 @@
         -Dprefix=%{_prefix} \
 %ifarch %{multilib_64_archs}
         -Dlibpth="/usr/local/lib64 /lib64 %{_prefix}/lib64" \
+%endif
         -Dprivlib="%{_prefix}/lib/perl5/%{perl_version}" \
         -Dsitelib="%{_prefix}/local/lib/perl5/site_perl/%{perl_version}" \
         -Dvendorlib="%{_prefix}/lib/perl5/vendor_perl/%{perl_version}" \
         -Darchlib="%{_libdir}/perl5/%{perl_version}/%{perl_archname}" \
         -Dsitearch="%{_prefix}/local/%{_lib}/perl5/site_perl/%{perl_version}/%{perl_archname}" \
         -Dvendorarch="%{_libdir}/perl5/vendor_perl/%{perl_version}/%{perl_archname}" \
-%endif
-        -Darchname=%{_arch}-%{_os} \
+        -Darchname=%{perl_archname} \
 %ifarch sparc sparcv9
         -Ud_longdbl \
 %endif
         -Dvendorprefix=%{_prefix} \
-        -Dsiteprefix=%{_prefix} \
+        -Dsiteprefix=%{_prefix}/local \
         -Duseshrplib \
         -Dusethreads \
         -Duseithreads \
@@ -929,10 +927,6 @@
 %endif
 %endif
 
-%ifarch %{multilib_64_archs}
-mkdir -p -m 755 ${RPM_BUILD_ROOT}%{_prefix}/lib64/perl5/vendor_perl/%{perl_version}/%{_arch}-%{_os}
-%endif
-
 # perl doesn't create this module, 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
 
@@ -1628,6 +1622,12 @@
 
 # Old changelog entries are preserved in CVS.
 %changelog
+* Tue Jun 10 2008 Stepan Kasal <skasal at redhat.com> 4:5.10.0-26
+- make config parameter list consistent for 32bit and 64bit platforms,
+  add config option -Dinc_version_list=none (#448735)
+- use perl_archname consistently
+- set siteprefix to prefix/local
+
 * Wed Jun 11 2008 Marcela Maslanova <mmaslano at redhat.com> 4:5.10.0-25
 - 447371 wrong access permission rt49003