packages: php/php.spec - fix libphp_common.la path in libphp5.la

[glen]

Author: glen                         Date: Thu Sep 22 07:20:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix libphp_common.la path in libphp5.la

---- Files affected:
packages/php:
   php.spec (1.952 -> 1.953) 

---- Diffs:

================================================================
Index: packages/php/php.spec
diff -u packages/php/php.spec:1.952 packages/php/php.spec:1.953
--- packages/php/php.spec:1.952	Thu Sep 22 07:33:03 2011
+++ packages/php/php.spec	Thu Sep 22 09:20:51 2011
@@ -110,7 +110,7 @@
 %undefine	with_filter
 %endif
 
-%define		rel	3
+%define		rel	4
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr.UTF-8):	Le langage de script embarque-HTML PHP
 Summary(pl.UTF-8):	Język skryptowy PHP
@@ -2287,10 +2287,6 @@
 %endif
 
 libtool --mode=install install -p libphp_common.la $RPM_BUILD_ROOT%{_libdir}
-# fix install paths, avoid evil rpaths
-sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
-# better solution?
-sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/php/build/acinclude.m4
 
 # install CGI/FCGI
 %if %{with cgi}
@@ -2374,6 +2370,13 @@
 install -p run-tests.php $RPM_BUILD_ROOT%{php_data_dir}/tests/php/run-tests.php
 cp -a tests/* $RPM_BUILD_ROOT%{php_data_dir}/tests/php
 
+# fix install paths, avoid evil rpaths
+sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" $RPM_BUILD_ROOT%{_libdir}/libphp_common.la
+# libphp5.la contains our buildroot in dependency_libs
+sed -i -e "/dependency_libs/ s,/[^ ]*/libs/libphp_common.la,%{_libdir}/libphp_common.la," $RPM_BUILD_ROOT%{_libdir}/libphp5.la
+# better solution?
+sed -i -e 's|libphp_common.la|$(libdir)/libphp_common.la|' $RPM_BUILD_ROOT%{_libdir}/php/build/acinclude.m4
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -3208,6 +3211,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.953  2011/09/22 07:20:51  glen
+- fix libphp_common.la path in libphp5.la
+
 Revision 1.952  2011/09/22 05:33:03  glen
 - do not package embed headers twice
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php/php.spec?r1=1.952&r2=1.953&f=u