SPECS: perl.spec - leave comment with --as-needed strip - pass arg...

[glen]

Author: glen                         Date: Sun Feb 24 16:35:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- leave comment with --as-needed strip
- pass arguments properly in runperl
- use %abi not %_abi (underscore paranoia)

---- Files affected:
SPECS:
   perl.spec (1.384 -> 1.385) 

---- Diffs:

================================================================
Index: SPECS/perl.spec
diff -u SPECS/perl.spec:1.384 SPECS/perl.spec:1.385
--- SPECS/perl.spec:1.384	Sun Feb 17 18:04:54 2008
+++ SPECS/perl.spec	Sun Feb 24 17:35:44 2008
@@ -26,16 +26,15 @@
 # - change all "R/BR: perl" to one of perl-{base,modules,devel}
 #
 
-%define _abi	5.10.0
-
+%define		abi	5.10.0
 %define		perlthread	%{?with_threads:-thread-multi}
 
 %define		perl_privlib	%{_datadir}/perl5/%{version}
 %define		perl_archlib	%{_libdir}/perl5/%{version}/%{_target_platform}%{perlthread}
 %define		perl_sitelib	%{_usr}/local/share/perl5
-%define		perl_sitearch	%{_usr}/local/lib/perl5/%{_abi}/%{_target_platform}%{perlthread}
+%define		perl_sitearch	%{_usr}/local/lib/perl5/%{abi}/%{_target_platform}%{perlthread}
 %define		perl_vendorlib	%{_datadir}/perl5/vendor_perl
-%define		perl_vendorarch	%{_libdir}/perl5/vendor_perl/%{_abi}/%{_target_platform}%{perlthread}
+%define		perl_vendorarch	%{_libdir}/perl5/vendor_perl/%{abi}/%{_target_platform}%{perlthread}
 
 %define		rel	2.2
 Summary:	Practical Extraction and Report Language (Perl)
@@ -689,14 +688,14 @@
 EOF
 
 %{__make} \
-	LIBPERL_SONAME=libperl.so.%{_abi} \
+	LIBPERL_SONAME=libperl.so.%{abi} \
 	LDDLFLAGS="%{rpmcflags} -shared"
 
 cat > runperl <<'EOF'
 #!/bin/sh
-LD_PRELOAD="%{_builddir}/%{name}-%{version}/libperl.so.%{_abi}" \
+LD_PRELOAD="%{_builddir}/%{name}-%{version}/libperl.so.%{abi}" \
 PERL5LIB="%{buildroot}%{perl_privlib}:%{buildroot}%{perl_archlib}" \
-exec %{buildroot}%{_bindir}/perl $*
+exec %{buildroot}%{_bindir}/perl ${1:+"$@"}
 EOF
 chmod a+x runperl
 
@@ -737,13 +736,13 @@
 
 ## Fix lib
 %{__rm} $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so
-#%{__ln_s} `%{__perl} -e '$_="'%{perl_archlib}/CORE/libperl.so.%{_abi}'";s|^'%{_libdir}'/*||;print'` \
-#	$RPM_BUILD_ROOT%{_libdir}/libperl.so.%{_abi}
-mv $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{_abi} $RPM_BUILD_ROOT%{_libdir}
-%{__ln_s} ../../../../libperl.so.%{_abi} $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{_abi}
-%{__ln_s} libperl.so.%{_abi} $RPM_BUILD_ROOT%{_libdir}/libperl.so
+#%{__ln_s} `%{__perl} -e '$_="'%{perl_archlib}/CORE/libperl.so.%{abi}'";s|^'%{_libdir}'/*||;print'` \
+#	$RPM_BUILD_ROOT%{_libdir}/libperl.so.%{abi}
+mv $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{abi} $RPM_BUILD_ROOT%{_libdir}
+%{__ln_s} ../../../../libperl.so.%{abi} $RPM_BUILD_ROOT%{perl_archlib}/CORE/libperl.so.%{abi}
+%{__ln_s} libperl.so.%{abi} $RPM_BUILD_ROOT%{_libdir}/libperl.so
 # installed as non-executable - let rpm generate deps
-chmod 755 $RPM_BUILD_ROOT%{_libdir}/libperl.so.%{_abi}
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/libperl.so.%{abi}
 
 ## Fix Config.pm: remove buildroot path and change man pages extensions
 %{__perl} -pi -e 's,%{buildroot}/*,/,g'			$RPM_BUILD_ROOT%{perl_archlib}/Config.pm
@@ -751,7 +750,7 @@
 %{__perl} -pi -e "s,^man3ext='3perl',man3ext='3pm',"	$RPM_BUILD_ROOT%{perl_archlib}/Config_heavy.pl
 
 ## Generate the *.ph files
-owd="`pwd`"
+owd=$(pwd)
 cd /usr/include
 H2PH=$RPM_BUILD_ROOT%{_bindir}/h2ph
 PHDIR=$RPM_BUILD_ROOT%{perl_archlib}
@@ -816,7 +815,7 @@
 
 ## dir tree for other perl modules
 install -d $RPM_BUILD_ROOT{%{perl_vendorlib},%{perl_vendorarch},%{perl_vendorarch}/auto}
-owd="`pwd`"
+owd=$(pwd)
 
 ## non-english man pages
 %{__bzip2} -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -826,6 +825,8 @@
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perlko.* $RPM_BUILD_ROOT%{_mandir}/ko/man1
 mv -f $RPM_BUILD_ROOT%{_mandir}/man1/perltw.* $RPM_BUILD_ROOT%{_mandir}/zh_TW/man1
 
+# `perl -MExtUtils::Embed -e ldopts` includes -Wl,--as-needed
+# which is then forced upon anyone embedding perl.
 sed -i -e 's#^\(ld.*=.*\)-Wl,--as-needed\(.*\)#\1 \2#g' $RPM_BUILD_ROOT%{perl_archlib}/Config*.pl
 
 rm -rf $RPM_BUILD_ROOT%{_mandir}/README.perl-non-english-man-pages
@@ -842,7 +843,7 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libperl.so.%{_abi}
+%attr(755,root,root) %{_libdir}/libperl.so.%{abi}
 
 %files base
 %defattr(644,root,root,755)
@@ -859,11 +860,11 @@
 %dir %{_libdir}/perl5/%{version}
 %dir %{perl_archlib}
 %dir %{perl_archlib}/CORE
-%attr(755,root,root) %{perl_archlib}/CORE/libperl.so.%{_abi}
+%attr(755,root,root) %{perl_archlib}/CORE/libperl.so.%{abi}
 %dir %{perl_archlib}/auto
 
 %dir %{_libdir}/perl5/vendor_perl
-%dir %{_libdir}/perl5/vendor_perl/%{_abi}
+%dir %{_libdir}/perl5/vendor_perl/%{abi}
 %{perl_vendorarch}
 %{perl_vendorlib}
 
@@ -1449,6 +1450,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.385  2008-02-24 16:35:44  glen
+- leave comment with --as-needed strip
+- pass arguments properly in runperl
+- use %abi not %_abi (underscore paranoia)
+
 Revision 1.384  2008-02-17 17:04:54  radek
 - release 2.2: updated list of Provides (needs checking), dropped old Obsoletes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/perl.spec?r1=1.384&r2=1.385&f=u