SPECS: php.spec - don't mungle build files

[glen]

Author: glen                         Date: Thu Apr 20 19:48:29 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- don't mungle build files

---- Files affected:
SPECS:
   php.spec (1.569 -> 1.570) 

---- Diffs:

================================================================
Index: SPECS/php.spec
diff -u SPECS/php.spec:1.569 SPECS/php.spec:1.570
--- SPECS/php.spec:1.569	Wed Apr 19 18:43:03 2006
+++ SPECS/php.spec	Thu Apr 20 21:48:23 2006
@@ -73,7 +73,7 @@
 %undefine	with_msession
 %endif
 
-%define	_rel 9.6
+%define	_rel 9.11
 Summary:	PHP: Hypertext Preprocessor
 Summary(fr):	Le langage de script embarque-HTML PHP
 Summary(pl):	Język skryptowy PHP
@@ -1784,28 +1784,20 @@
 	cp -f main/php_config.h php_config.h.$sapi
 done
 
-# for now session_mm doesn't work with shared session module...
-# --enable-session=shared
-# %{!?with_mm:--with-mm=shared,no}%{?with_mm:--with-mm=shared}
+# must make this first, so modules can link against it.
+%{__make} libphp_common.la
 
 %{__make} build-modules
 
-%{__make} libphp_common.la
 # fix install paths, avoid evil rpaths
-sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la
+#sed -i -e "s|^libdir=.*|libdir='%{_libdir}'|" libphp_common.la
 
 %if %{with apache1}
 %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache/libphp5.la -f Makefile.apxs1
-sed -i -e "
-s|^libdir=.*|libdir='%{_libdir}/apache1'|;
-s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache1 |" sapi/apache/libphp5.la
 %endif
 
 %if %{with apache2}
 %{__make} libtool-sapi LIBTOOL_SAPI=sapi/apache2handler/libphp5.la -f Makefile.apxs2
-sed -i -e "
-s|^libdir=.*|libdir='%{_libdir}/apache'|;
-s|^(relink_command=.* -rpath )[^ ]*/libs |$1%{_libdir}/apache |" sapi/apache2handler/libphp5.la
 %endif
 
 # FCGI
@@ -1832,25 +1824,22 @@
 	$RPM_BUILD_ROOT/etc/{apache/conf.d,httpd/httpd.conf} \
 	$RPM_BUILD_ROOT%{_mandir}/man1 \
 
+# install the apache modules' files
+%{__make} install-headers install-build install-modules install-programs \
+	INSTALL_ROOT=$RPM_BUILD_ROOT
+
 # install apache1 DSO module
 %if %{with apache1}
-libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1/
+libtool --silent --mode=install install sapi/apache/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache1
 %endif
 
 # install apache2 DSO module
 %if %{with apache2}
-libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache/
+libtool --silent --mode=install install sapi/apache2handler/libphp5.la $RPM_BUILD_ROOT%{_libdir}/apache
 %endif
 
 libtool --silent --mode=install install libphp_common.la $RPM_BUILD_ROOT%{_libdir}
 
-# install the apache modules' files
-%{__make} install-headers install-build install-modules install-programs \
-	INSTALL_ROOT=$RPM_BUILD_ROOT
-
-# as of 5.0.5, phpextdist isn't installed by default
-install scripts/dev/phpextdist $RPM_BUILD_ROOT%{_bindir}
-
 # install CGI
 libtool --silent --mode=install install sapi/cgi/php $RPM_BUILD_ROOT%{_bindir}/php.cgi
 
@@ -1864,9 +1853,8 @@
 install sapi/cli/php.1 $RPM_BUILD_ROOT%{_mandir}/man1/php.1
 echo ".so php.1" >$RPM_BUILD_ROOT%{_mandir}/man1/php.cli.1
 
-# TODO:
-# Why make install doesn't install libphp5.so ?
-#install libs/libphp5.so $RPM_BUILD_ROOT%{apachelib}
+# as of 5.0.5, phpextdist isn't installed by default
+install scripts/dev/phpextdist $RPM_BUILD_ROOT%{_bindir}
 
 ln -sf php.cli $RPM_BUILD_ROOT%{_bindir}/php
 
@@ -3058,6 +3046,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.570  2006/04/20 19:48:23  glen
+- don't mungle build files
+
 Revision 1.569  2006/04/19 16:43:03  adamg
 - fix for two security issues: XSS in phpinfo() and binary safeness in
   html_decode
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/php.spec?r1=1.569&r2=1.570&f=u