SPECS: php4.spec - install libphp_common.la first so that apache s...

[glen]

Author: glen                         Date: Wed May 10 08:59:34 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- install libphp_common.la first so that apache sapis get linked with installed
  lihphp_common, not (bogus!) one from system (noted on amd64 arch)
- drop apache sapis .la edit, we don't install these, so why bother
- rel 12

---- Files affected:
SPECS:
   php4.spec (1.543 -> 1.544) 

---- Diffs:

================================================================
Index: SPECS/php4.spec
diff -u SPECS/php4.spec:1.543 SPECS/php4.spec:1.544
--- SPECS/php4.spec:1.543	Thu Apr 27 21:20:55 2006
+++ SPECS/php4.spec	Wed May 10 10:59:29 2006
@@ -71,7 +71,7 @@
 %undefine	with_msession
 %endif
 
-%define	_rel 11
+%define	_rel 12
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -1904,25 +1904,22 @@
 %{__make} install-headers install-build install-modules install-programs \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
+libtool --silent --mode=install install 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
+
 # install apache1 DSO module
 %if %{with apache1}
-sed -i -e "s|^libdir=.*|libdir='%{_libdir}/apache1'|" sapi/apache/libphp4.la
-sed -i -e 's|^\(relink_command=.* -rpath \)[^ ]*/libs |\1%{_libdir}/apache1 |' sapi/apache/libphp4.la
 libtool --silent --mode=install install sapi/apache/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache1
 rm $RPM_BUILD_ROOT%{_libdir}/apache1/libphp4.la
 %endif
 
 # install apache2 DSO module
 %if %{with apache2}
-sed -i -e "s|^libdir=.*|libdir='%{_libdir}/apache'|" sapi/apache2handler/libphp4.la
-sed -i -e 's|^\(relink_command=.* -rpath \)[^ ]*/libs |\1%{_libdir}/apache |' sapi/apache2handler/libphp4.la
 libtool --silent --mode=install install sapi/apache2handler/libphp4.la $RPM_BUILD_ROOT%{_libdir}/apache
 rm $RPM_BUILD_ROOT%{_libdir}/apache/libphp4.la
 %endif
 
-libtool --silent --mode=install install 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
 
@@ -3227,6 +3224,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.544  2006/05/10 08:59:29  glen
+- install libphp_common.la first so that apache sapis get linked with installed
+  lihphp_common, not (bogus!) one from system (noted on amd64 arch)
+- drop apache sapis .la edit, we don't install these, so why bother
+- rel 12
+
 Revision 1.543  2006/04/27 19:20:55  glen
 - rel 11
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php4.spec?r1=1.543&r2=1.544&f=u