- use new php extension macros

[packages/ZendGuardLoader.git] / ZendGuardLoader.spec

diff --git a/ZendGuardLoader.spec b/ZendGuardLoader.spec
index a779cad218c240ec36b53cbbd1f3ac6ede634aa6..c377fee471543a913e3c4470a040e8999db858ab 100644 (file)
--- a/ZendGuardLoader.spec
+++ b/ZendGuardLoader.spec
@@ -8,7 +8,7 @@ Summary:        Zend Optimizer - PHP code optimizer
 Summary(pl):   Zend Optimizer - optymalizator kodu PHP
 Name:          ZendOptimizer
 Version:       2.6.2
-Release:       1
+Release:       2
 License:       Zend License, distributable only if unmodified and for free (see LICENSE)
 Group:         Libraries
 Source0:       http://downloads.zend.com/optimizer/2.6.2/%{name}-%{version}-linux-glibc21-i386.tar.gz
@@ -16,12 +16,8 @@ Source0:     http://downloads.zend.com/optimizer/2.6.2/%{name}-%{version}-linux-glib
 Source1:       http://downloads.zend.com/optimizer/2.6.2/%{name}-%{version}-linux-glibc23-x86_64.tar.gz
 # Source1-md5: 7d7aaee366ff653e78beb457701197c5
 URL:           http://www.zend.com/zend/optimizer.php
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.344
 BuildRequires: tar >= 1:1.15.1
-# 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:      %{name}(php) = %{version}-%{release}
 Requires(triggerpostun):       sed >= 4.0
 ExclusiveArch: %{ix86} %{x8664}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -37,8 +33,7 @@ Summary:      Zend Optimizer for PHP 4.x
 Summary(pl):   Zend Optimizer dla PHP 4.x
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      php4-common >= 3:4.0.6
-Provides:      %{name}(php) = %{version}-%{release}
+Requires:      php4-common >= 3:4.4.0-3
 
 %description -n php4-%{name}
 Zend Optimizer for PHP 4.x.
@@ -51,8 +46,7 @@ Summary:      Zend Optimizer for PHP 5.x
 Summary(pl):   Zend Optimizer dla PHP 5.x
 Group:         Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      php-common >= 4:5.0.0
-Provides:      %{name}(php) = %{version}-%{release}
+Requires:      php-common >= 4:5.0.4
 
 %description -n php-%{name}
 Zend Optimizer for PHP 5.x.
@@ -119,8 +113,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %preun -n php4-%{name}
 if [ "$1" = "0" ]; then
-       [ ! -f /etc/apache/conf.d/??_mod_php4.conf ] || %service -q apache restart
-       [ ! -f /etc/httpd/httpd.conf/??_mod_php4.conf ] || %service -q httpd restart
+       %php4_webserver_restart
 fi
 
 %post -n php4-%{name}
@@ -129,14 +122,11 @@ fi
 if [ ! -L %{_libdir}/Zend/etc ]; then
        ln -snf /etc/php4 %{_libdir}/Zend/etc
 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
-
+%php4_webserver_restart
 
 %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
+       %php_webserver_restart
 fi
 
 %post -n php-%{name}
@@ -145,8 +135,7 @@ fi
 if [ ! -L %{_libdir}/Zend/etc ]; then
        ln -snf /etc/php %{_libdir}/Zend/etc
 fi
-[ ! -f /etc/apache/conf.d/??_mod_php.conf ] || %service -q apache restart
-[ ! -f /etc/httpd/httpd.conf/??_mod_php.conf ] || %service -q httpd restart
+%php_webserver_restart
 
 %post
 if [ "$1" = 1 ]; then