Author: glen Date: Fri Sep 30 10:11:44 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - use conf.d for ini, complete php setup
---- Files affected: SPECS: ZendOptimizer.spec (1.19.2.4 -> 1.19.2.5) ---- Diffs: ================================================================ Index: SPECS/ZendOptimizer.spec diff -u SPECS/ZendOptimizer.spec:1.19.2.4 SPECS/ZendOptimizer.spec:1.19.2.5 --- SPECS/ZendOptimizer.spec:1.19.2.4 Fri Sep 30 12:05:30 2005 +++ SPECS/ZendOptimizer.spec Fri Sep 30 12:11:35 2005 @@ -9,7 +9,7 @@ Summary(pl): Zend Optimizer - optymalizator kodu PHP Name: ZendOptimizer Version: 2.5.10a -Release: 0.9 +Release: 0.10 License: Zend License, distributable only if unmodified and for free (see LICENSE) Group: Libraries Source0: http://downloads.zend.com/optimizer/2.5.10/%{name}-%{version}-linux-glibc21-i386.tar.gz @@ -44,6 +44,7 @@ Provides: ZendOptimizer(php) %description -n php4-%{name} +Zend Optimizer for PHP 4.x. %package -n php-%{name} Summary: php @@ -53,6 +54,7 @@ Provides: ZendOptimizer(php) %description -n php-%{name} +Zend Optimizer for PHP 5.x. %prep %setup -q -c @@ -76,6 +78,7 @@ cd data install zendid $RPM_BUILD_ROOT%{_bindir} install poweredbyoptimizer.gif $RPM_BUILD_ROOT%{_sysconfdir}/php +install poweredbyoptimizer.gif $RPM_BUILD_ROOT%{_sysconfdir}/php4 install *.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib for a in *_comp; do @@ -106,64 +109,32 @@ %clean rm -rf $RPM_BUILD_ROOT -# NOTE THIS MIGHT BE INSECURE WHEN SOMEONE IS USING COMMERCIAL ZEND PRODUCTS -# THEN AGAIN HE/SHE SHOULD USE THEIR OPTIMIZER -%preun +%preun -n php4-%{name} if [ "$1" = "0" ]; then - umask 022 - # just php5, php4 has confdir - for php in /etc/php/php.ini; do - if [ -f $php ]; then - echo "deactivating module 'ZendOptimizer.so' in $php" 1>&2 - grep -v '\[Zend\]' $php |\ - grep -v zend_extension |grep -v zend_optimizer > $php.tmp - mv $php.tmp $php - fi - done - # apache1 - if [ -f /etc/apache/conf.d/??_mod_php4.conf ] && [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 - fi - # apache2 - if [ -f /etc/httpd/httpd.conf/??_mod_php4.conf ] && [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 - fi + [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart fi -%post -umask 022 -for php in /etc/php/php.ini; do - # just php5, php4 has confdir - if [ -f $php ]; then - echo "activating module 'ZendOptimizer.so' in $php" 1>&2 - if grep -q ^zend_optimizer.optimization_level ; then - optlevel=`grep ^zend_optimizer $php|cut -d'=' -f2|tr -d ' '|tr -d '"'|tr -d "'"|tr -d ';'` - else - optlevel="15" - fi - cp $php{,.zend-backup} - grep -v zend_optimizer.optimization_level $php | \ - grep -v zend_extension > $php.tmp - echo '[Zend]' >> $php.tmp - echo "zend_optimizer.optimization_level=$optlevel" >> $php.tmp - echo "zend_extension_manager.optimizer=%{_libdir}/Zend/lib/Optimizer-%{version}" >> $php.tmp - echo "zend_extension_manager.optimizer_ts=%{_libdir}/Zend/lib/Optimizer_TS-%{version}" >> $php.tmp - echo "zend_extension=%{_libdir}/Zend/lib/ZendExtensionManager.so" >> $php.tmp - echo "zend_extension_ts=%{_libdir}/Zend/lib/ZendExtensionManager_TS.so" >> $php.tmp - mv $php{.tmp,} - fi -done +%post -n php4-%{name} +[ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart -# apache1 -if [ -f /etc/apache/conf.d/??_mod_php4.conf ] && [ -f /var/lock/subsys/apache ]; then - /etc/rc.d/init.d/apache restart 1>&2 -fi -# apache2 -if [ -f /etc/httpd/httpd.conf/??_mod_php4.conf ] && [ -f /var/lock/subsys/httpd ]; then - /etc/rc.d/init.d/httpd restart 1>&2 +%preun -n php-%{name} +if [ "$1" = "0" ]; then + [ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart + [ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart fi -echo "Remember: Read the %{_docdir}/ZendOptimizer-%{version}/LICENSE.gz !" +%post -n php-%{name} +[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart +[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart + +%post +if [ "$1" = 1 ]; then +%banner -e %{name} <<EOF +Remember to read %{_docdir}/%{name}-%{version}/LICENSE.gz! +EOF +fi # TODO: trigger for removing [Zend] section from php.ini @@ -171,9 +142,6 @@ %defattr(644,root,root,755) %doc data/doc LICENSE %attr(755,root,root) %{_bindir}/zendid -%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php/pack.ini -%{_sysconfdir}/php/poweredbyoptimizer.gif - %dir %{_libdir}/Zend %dir %{_libdir}/Zend/lib %dir %{_libdir}/Zend/lib/Optimizer-%{version} @@ -189,11 +157,15 @@ %files -n php4-%{name} %defattr(644,root,root,755) +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php4/pack.ini %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php4/conf.d/*.ini +%{_sysconfdir}/php4/poweredbyoptimizer.gif %files -n php-%{name} %defattr(644,root,root,755) +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php/pack.ini %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php/conf.d/*.ini +%{_sysconfdir}/php/poweredbyoptimizer.gif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -201,6 +173,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19.2.5 2005/09/30 10:11:35 glen +- use conf.d for ini, complete php setup + Revision 1.19.2.4 2005/09/30 10:05:30 glen - simplified files and install ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ZendOptimizer.spec?r1=1.19.2.4&r2=1.19.2.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
