SPECS (DEVEL): ZendOptimizer.spec - 2.5.10. NFY. still doesn't wor...

glen glen at pld-linux.org
Fri Jul 15 19:42:21 CEST 2005


Author: glen                         Date: Fri Jul 15 17:42:21 2005 GMT
Module: SPECS                         Tag: DEVEL
---- Log message:
- 2.5.10. NFY. still doesn't work with php 4.4.0

---- Files affected:
SPECS:
   ZendOptimizer.spec (1.19.2.1 -> 1.19.2.2) 

---- Diffs:

================================================================
Index: SPECS/ZendOptimizer.spec
diff -u SPECS/ZendOptimizer.spec:1.19.2.1 SPECS/ZendOptimizer.spec:1.19.2.2
--- SPECS/ZendOptimizer.spec:1.19.2.1	Fri Jul 15 18:40:33 2005
+++ SPECS/ZendOptimizer.spec	Fri Jul 15 19:42:16 2005
@@ -8,18 +8,21 @@
 Summary:	Zend Optimizer - PHP code optimizer
 Summary(pl):	Zend Optimizer - optymalizator kodu PHP
 Name:		ZendOptimizer
-Version:	2.5.7
-Release:	0.7
+Version:	2.5.10
+Release:	0.5
 License:	Zend License, distributable only if unmodified and for free (see LICENSE)
 Group:		Libraries
 Source0:	%{name}-%{version}-linux-glibc21-i386.tar.gz
-# Source0-md5:	441192fb05882126242657d180a4c96a
+# Source0-md5:	6da78a6298e2a6f6d9662a25130367dd
 Source1:	%{name}-%{version}-linux-glibc23-amd64.tar.gz
-# Source1-md5:	1c22955ad63d1c73f969ebd9c4899b7d
+# Source1-md5:	e4d6f2bdd1e39fb44f1080af8a32e4f4
 URL:		http://www.zend.com/zend/optimizer.php
 BuildRequires:	rpmbuild(macros) >= 1.213
 Requires(post):	grep >= 2:2.5.1
 Requires(post):	sed >= 4.0.0
+# circular dependency, so ones upgraded are forced to choose php and
+# ones that want to install specific for specific version need not to
+# install ZendOptimizer separately
 Requires:	ZendOptimizer(php)
 ExclusiveArch:	%{ix86} %{x8664}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -33,20 +36,18 @@
 %package -n php4-%{name}
 Summary:	php4
 Group:		php4
+PreReq:		ZendOptimizer = %{version}-%{release}
 Requires:	php >= 3:4.0.6
-# php4 provides php with epoch 0 while php provides php with epoch 3, workaround
-Requires:	php >= 0:4.0.6
 Provides:	ZendOptimizer(php)
-Obsoletes:	ZendOptimizer(php)
 
 %description -n php4-%{name}
 
 %package -n php-%{name}
 Summary:	php
 Group:		php
+PreReq:		ZendOptimizer = %{version}-%{release}
 Requires:	php >= 3:5.0.0
 Provides:	ZendOptimizer(php)
-Obsoletes:	ZendOptimizer(php)
 
 %description -n php-%{name}
 
@@ -95,16 +96,29 @@
 ln -s %{_sysconfdir}/php $RPM_BUILD_ROOT%{_libdir}/Zend/etc
 ln -s %{_bindir} $RPM_BUILD_ROOT%{_libdir}/Zend/bin
 
+cat <<'EOF' > zend.ini
+[Zend]
+zend_optimizer.optimization_level=15
+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
+zend_extension_ts=%{_libdir}/Zend/lib/ZendExtensionManager_TS.so
+EOF
+
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/php{,4}/conf.d
+install zend.ini $RPM_BUILD_ROOT%{_sysconfdir}/php4/conf.d/%{name}.ini
+install zend.ini $RPM_BUILD_ROOT%{_sysconfdir}/php/conf.d/%{name}.ini
+
 %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
 if [ "$1" = "0" ]; then
 	umask 022
-	for php in /etc/php{,4}/php.ini; do
+	# 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 |\
@@ -113,18 +127,19 @@
 		fi
 	done
 	# apache1
-	if [ -f /var/lock/subsys/apache ]; then
+	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 /var/lock/subsys/httpd ]; then
+	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
 fi
 
 %post
 umask 022
-for php in /etc/php{,4}/php.ini; do
+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
@@ -146,16 +161,18 @@
 done
 
 # apache1
-if [ -f /var/lock/subsys/apache ]; then
+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 /var/lock/subsys/httpd ]; then
+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
 
 echo "Remember: Read the %{_docdir}/ZendOptimizer-%{version}/LICENSE !"
 
+# TODO: trigger for removing [Zend] section from php.ini
+
 %files
 %defattr(644,root,root,755)
 %ifarch %{ix86}
@@ -194,12 +211,23 @@
 %{_libdir}/Zend/lib/Optimizer_TS-%{version}/php-5.0.x/ZendOptimizer.so
 %{_libdir}/Zend/lib/ZendExtensionManager_TS.so
 
+%files -n php4-%{name}
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php4/conf.d/*.ini
+
+%files -n php-%{name}
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/php/conf.d/*.ini
+
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.19.2.2  2005/07/15 17:42:16  glen
+- 2.5.10. NFY. still doesn't work with php 4.4.0
+
 Revision 1.19.2.1  2005/07/15 16:40:33  glen
 - unfinished package split devel
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ZendOptimizer.spec?r1=1.19.2.1&r2=1.19.2.2&f=u




More information about the pld-cvs-commit mailing list