[php-eaccelerator/f12/master] strong requires PHP version

Remi Collet remi at fedoraproject.org
Sun Aug 8 10:16:39 UTC 2010


commit 69f901b1d65f92be697af5696d74cf03cc60b39f
Author: remi <fedora at famillecollet.com>
Date:   Sun Aug 8 11:16:13 2010 +0200

    strong requires PHP version

 php-eaccelerator.spec |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/php-eaccelerator.spec b/php-eaccelerator.spec
index bb04155..526f4e1 100644
--- a/php-eaccelerator.spec
+++ b/php-eaccelerator.spec
@@ -1,4 +1,5 @@
 %global php_extdir %(php-config --extension-dir 2>/dev/null || echo "undefined")
+%global php_version %((echo 0; php-config --version 2>/dev/null) | tail -1)
 
 # This is the apache userid, used for sysvipc semaphores which is the default
 # on ppc since spinlock is not detected (not supported?)
@@ -10,7 +11,7 @@ Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: 0.9.6.1
 #Release: 0.2%{?svn:.svn%{svn}}%{?dist}
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 # The eaccelerator module itself is GPLv2+
 # The PHP control panel is under the Zend license (control.php and dasm.php)
@@ -23,11 +24,10 @@ Source0: http://snapshots.eaccelerator.net/eaccelerator-svn%{svn}.tar.gz
 Source0: http://bart.eaccelerator.net/source/%{version}/eaccelerator-%{version}.tar.bz2
 %endif
 Source1: php-eaccelerator.cron
-Patch1: eaccelerator-nophpversioncheck.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: php(zend-abi) = %{php_zend_api}
-Requires: php(api) = %{php_core_api}
+# ABI check is not enough for this extension (http://eaccelerator.net/ticket/438)
+Requires: php-common = %{php_version}
 Provides: php-zend_extension
 Conflicts: php-mmcache
 BuildRequires: php-devel >= 5.1.0
@@ -47,7 +47,6 @@ that the overhead of compiling is almost completely eliminated.
 %setup -q -n eaccelerator-%{version}
 %endif
 
-%patch1 -p1 -b .nophpversioncheck
 
 # Change paths in the example config, other values are changed by a patch
 %{__sed} -i 's|/usr/lib/php4/|%{php_extdir}/|g;
@@ -130,6 +129,9 @@ fi
 
 
 %changelog
+* Sun Aug 08 2010 Remi Collet <Fedora at FamilleCollet.com> - 1:0.9.6.1-2
+- strong requires PHP version
+
 * Sat Jul 03 2010 Remi Collet <Fedora at FamilleCollet.com> - 1:0.9.6.1-1
 - update to 0.9.6.1
 


More information about the scm-commits mailing list