Author: glen Date: Fri Sep 30 11:25:23 2005 GMT Module: SPECS Tag: DEVEL ---- Log message: - two ini files for package settings and user settings. pack.ini gets overwritten with upgrades
---- Files affected: SPECS: ZendOptimizer.spec (1.19.2.12 -> 1.19.2.13) ---- Diffs: ================================================================ Index: SPECS/ZendOptimizer.spec diff -u SPECS/ZendOptimizer.spec:1.19.2.12 SPECS/ZendOptimizer.spec:1.19.2.13 --- SPECS/ZendOptimizer.spec:1.19.2.12 Fri Sep 30 13:13:20 2005 +++ SPECS/ZendOptimizer.spec Fri Sep 30 13:25:11 2005 @@ -9,7 +9,7 @@ Summary(pl): Zend Optimizer - optymalizator kodu PHP Name: ZendOptimizer Version: 2.5.10a -Release: 0.27 +Release: 0.29 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 @@ -67,9 +67,6 @@ rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_bindir},/etc/php4,/etc/php} -echo "zend_optimizer.version=%{version}" > $RPM_BUILD_ROOT/etc/php4/pack.ini -echo "zend_optimizer.version=%{version}" > $RPM_BUILD_ROOT/etc/php/pack.ini - cd data for a in *_comp; do d=$(basename $a _comp | tr _ .) @@ -88,8 +85,16 @@ ln -s %{_bindir} $RPM_BUILD_ROOT%{_libdir}/Zend/bin cat <<'EOF' > zendoptimizer.ini +; ZendOptimizer user settings. [Zend] zend_optimizer.optimization_level=15 +EOF + +cat <<'EOF' > pack.ini +; ZendOptimizer package settings. Overwritten which each upgrade. +; if you need to add options, edit %{name}.ini instead +[Zend] +zend_optimizer.version=%{version} zend_extension_manager.optimizer=%{_libdir}/Zend/lib/Optimizer-%{version} zend_extension_manager.optimizer_ts=%{_libdir}/Zend/lib/Optimizer_TS-%{version} zend_extension=%{_libdir}/Zend/lib/ZendExtensionManager.so @@ -99,6 +104,8 @@ install -d $RPM_BUILD_ROOT%{_sysconfdir}/php{,4}/conf.d install zendoptimizer.ini $RPM_BUILD_ROOT/etc/php4/conf.d/%{name}.ini install zendoptimizer.ini $RPM_BUILD_ROOT/etc/php/conf.d/%{name}.ini +install pack.ini $RPM_BUILD_ROOT/etc/php4/conf.d/%{name}_pack.ini +install pack.ini $RPM_BUILD_ROOT/etc/php/conf.d/%{name}_pack.ini %clean rm -rf $RPM_BUILD_ROOT @@ -144,7 +151,7 @@ %triggerpostun -n php4-%{name} -- %{name} < 2.5.10a-0.20 if [ -f /etc/php4/php.ini ]; then cp -f /etc/php4/conf.d/ZendOptimizer.ini{,.rpmnew} - sed -ne '/^\(zend_\|\[Zend\]\)/p' /etc/php4/php.ini > /etc/php4/conf.d/ZendOptimizer.ini + sed -ne '/^\(zend_\|\[Zend\]\)/{/^zend_extension\(_manager\.optimizer\)\?\(_ts\)\?=/d;p}' /etc/php4/php.ini > /etc/php4/conf.d/ZendOptimizer.ini cp -f /etc/php4/php.ini{,.rpmsave} sed -i -e '/^\(zend_\|\[Zend\]\)/d' /etc/php4/php.ini fi @@ -152,7 +159,7 @@ %triggerpostun -- %{name} < 2.5.10a-0.20 if [ -f /etc/php/php.ini ]; then cp -f /etc/php/conf.d/ZendOptimizer.ini{,.rpmnew} - sed -ne '/^\(zend_\|\[Zend\]\)/p' /etc/php/php.ini > /etc/php/conf.d/ZendOptimizer.ini + sed -ne '/^\(zend_\|\[Zend\]\)/{/^zend_extension\(_manager\.optimizer\)\?\(_ts\)\?=/d;p}' /etc/php/php.ini > /etc/php/conf.d/ZendOptimizer.ini cp -f /etc/php/php.ini{,.rpmsave} sed -i -e '/^\(zend_\|\[Zend\]\)/d' /etc/php/php.ini fi @@ -176,14 +183,14 @@ %files -n php4-%{name} %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) /etc/php4/pack.ini -%config(noreplace) %verify(not md5 mtime size) /etc/php4/conf.d/*.ini +%config(noreplace) %verify(not md5 mtime size) /etc/php4/conf.d/%{name}.ini +%config %verify(not md5 mtime size) /etc/php4/conf.d/%{name}_pack.ini /etc/php4/poweredbyoptimizer.gif %files -n php-%{name} %defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) /etc/php/pack.ini -%config(noreplace) %verify(not md5 mtime size) /etc/php/conf.d/*.ini +%config(noreplace) %verify(not md5 mtime size) /etc/php/conf.d/%{name}.ini +%config %verify(not md5 mtime size) /etc/php/conf.d/%{name}_pack.ini /etc/php/poweredbyoptimizer.gif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -192,6 +199,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.19.2.13 2005/09/30 11:25:11 glen +- two ini files for package settings and user settings. pack.ini gets overwritten with upgrades + Revision 1.19.2.12 2005/09/30 11:13:20 glen - require php-common rather php as latter one basically means apache SAPIs ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/ZendOptimizer.spec?r1=1.19.2.12&r2=1.19.2.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
