- 2.5.10. NFY. still doesn't work with php 4.4.0

Changed files:
    ZendGuardLoader.spec -> 1.19.2.2

diff --git a/ZendGuardLoader.spec b/ZendGuardLoader.spec
index 52c8bcb633d3786719da38aad3724b94dacc23b0..4fd004019a908c465909e1fbcf262b241e6001f2 100644 (file)
--- a/ZendGuardLoader.spec
+++ b/ZendGuardLoader.spec
@@ -7,18 +7,21 @@
 Summary:       Zend Optimizer - PHP code optimizer
 Summary(pl):   Zend Optimizer - optymalizator kodu PHP
 Name:          ZendOptimizer
 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
 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:       %{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
 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)
 Requires:      ZendOptimizer(php)
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)


@@ -32,20 +35,18 @@ Zend Optimizer - optymalizator kodu PHP.
 %package -n php4-%{name}
 Summary:       php4
 Group:         php4
 %package -n php4-%{name}
 Summary:       php4
 Group:         php4

+PreReq:                ZendOptimizer = %{version}-%{release}

 Requires:      php >= 3:4.0.6
 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)
 Provides:      ZendOptimizer(php)

-Obsoletes:     ZendOptimizer(php)

 
 %description -n php4-%{name}
 
 %package -n php-%{name}
 Summary:       php
 Group:         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)
 Requires:      php >= 3:5.0.0
 Provides:      ZendOptimizer(php)

-Obsoletes:     ZendOptimizer(php)

 
 %description -n php-%{name}
 
 
 %description -n php-%{name}
 


@@ -94,16 +95,29 @@ install 5_0_x_comp/TS/ZendOptimizer.so $RPM_BUILD_ROOT%{_libdir}/Zend/lib/Optimi
 ln -s %{_sysconfdir}/php $RPM_BUILD_ROOT%{_libdir}/Zend/etc
 ln -s %{_bindir} $RPM_BUILD_ROOT%{_libdir}/Zend/bin
 
 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
 %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
 %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 |\
                if [ -f $php ]; then
                        echo "deactivating module 'ZendOptimizer.so' in $php" 1>&2
                        grep -v '\[Zend\]' $php |\


@@ -112,18 +126,19 @@ if [ "$1" = "0" ]; then
                fi
        done
        # apache1
                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
                /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
                /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
        if [ -f $php ]; then
                echo "activating module 'ZendOptimizer.so' in $php" 1>&2
                if grep -q ^zend_optimizer.optimization_level ; then


@@ -145,16 +160,18 @@ for php in /etc/php{,4}/php.ini; do
 done
 
 # apache1
 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
        /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 !"
 
        /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}
 %files
 %defattr(644,root,root,755)
 %ifarch %{ix86}


@@ -192,3 +209,11 @@ echo "Remember: Read the %{_docdir}/ZendOptimizer-%{version}/LICENSE !"
 %{_libdir}/Zend/lib/Optimizer_TS-%{version}/php-4.3.x/ZendOptimizer.so
 %{_libdir}/Zend/lib/Optimizer_TS-%{version}/php-5.0.x/ZendOptimizer.so
 %{_libdir}/Zend/lib/ZendExtensionManager_TS.so
 %{_libdir}/Zend/lib/Optimizer_TS-%{version}/php-4.3.x/ZendOptimizer.so
 %{_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