SPECS: perl.spec - try with libperl installed as standard system l...

[qboosh]

Author: qboosh                       Date: Sun Feb 10 14:04:49 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- try with libperl installed as standard system library

---- Files affected:
SPECS:
   perl.spec (1.377 -> 1.378) 

---- Diffs:

================================================================
Index: SPECS/perl.spec
diff -u SPECS/perl.spec:1.377 SPECS/perl.spec:1.378
--- SPECS/perl.spec:1.377	Sun Feb 10 14:44:33 2008
+++ SPECS/perl.spec	Sun Feb 10 15:04:43 2008
@@ -676,9 +676,6 @@
 	-%{?with_threads:D}%{!?with_threads:U}usethreads \
 	-Duselargefiles
 
-## why were these three undefined?
-#	-Ud_setresgid \
-#	-Ud_setresuid \
 ## what's the problem with this one?
 # %ifarch sparc sparc64
 #	-Ud_longdbl
@@ -743,9 +740,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}
+#%{__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}/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}
 
 ## Fix Config.pm: remove buildroot path and change man pages extensions
 %{__perl} -pi -e 's,%{buildroot}/*,/,g'			$RPM_BUILD_ROOT%{perl_archlib}/Config.pm
@@ -844,12 +845,7 @@
 
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libperl.so.*
-%dir %{_libdir}/perl5
-%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) %{_libdir}/libperl.so.%{_abi}
 
 %files base
 %defattr(644,root,root,755)
@@ -862,6 +858,11 @@
 
 %dir %{_datadir}/perl5
 %dir %{perl_privlib}
+%dir %{_libdir}/perl5
+%dir %{_libdir}/perl5/%{version}
+%dir %{perl_archlib}
+%dir %{perl_archlib}/CORE
+%attr(755,root,root) %{perl_archlib}/CORE/libperl.so.%{_abi}
 %dir %{perl_archlib}/auto
 
 %dir %{_libdir}/perl5/vendor_perl
@@ -1448,6 +1449,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.378  2008-02-10 14:04:43  qboosh
+- try with libperl installed as standard system library
+
 Revision 1.377  2008-02-10 13:44:33  qboosh
 - BR llh 2.6.24 for expected asm dirs set
 
================================================================

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