rpms/php-eaccelerator/devel php-eaccelerator.spec,1.14,1.15

[Matthias Saou (thias)]

Author: thias

Update of /cvs/extras/rpms/php-eaccelerator/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8132

Modified Files:
	php-eaccelerator.spec 
Log Message:
Keep trying to get the API version detection to work in all possible cases.



Index: php-eaccelerator.spec
===================================================================
RCS file: /cvs/extras/rpms/php-eaccelerator/devel/php-eaccelerator.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- php-eaccelerator.spec	5 May 2006 09:50:00 -0000	1.14
+++ php-eaccelerator.spec	5 May 2006 11:41:33 -0000	1.15
@@ -1,11 +1,15 @@
-%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{_libdir}/php4)
-%define php_includes %(php-config --includes 2>/dev/null || echo)
-%define php_apiver %(cd %{_tmppath}; echo PHP_API_VERSION | %{__cc} -E --include=php.h %{php_includes} - 2>/dev/null | tail -1)
-%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo 5.1.3)}
+# Useful defaults when building in chroots on systems where PHP is unavailable
+%define default_extdir  %{_libdir}/php4
+%define default_apiver  20041225
+%define default_version 5.1.3
 
 %define module_version 0.9.5
 %define prever         beta2
 
+%define php_extdir %(php-config --extension-dir 2>/dev/null || echo %{default_extdir})
+%define php_apiver %(php -i 2>/dev/null | sed -n 's/^PHP API => //p' 2>/dev/null || echo %{default_apiver})
+%{!?php_version:%define php_version %(php-config --version 2>/dev/null || echo %{default_version})}
+
 # This is the apache userid, only used for sysvipc semaphores which is the
 # default on ppc since spinlock is not detected
 %define userid         48
@@ -13,7 +17,7 @@
 Summary: PHP accelerator, optimizer, encoder and dynamic content cacher
 Name: php-eaccelerator
 Version: %{php_version}_%{module_version}
-Release: 0.1.%{prever}%{?dist}
+Release: 0.2.%{prever}%{?dist}
 License: GPL
 Group: Development/Languages
 URL: http://eaccelerator.sourceforge.net/
@@ -97,7 +101,12 @@
 
 
 %changelog
-* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 5.1.2_0.9.5-0.1.beta2
+* Fri May  5 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.5-0.2.beta2
+- Rework heavily the API version requirement detection, should work with
+  chroots builds where PHP isn't installed outside.
+- Replace the CC way of getting the API version with php -i output.
+
+* Tue Apr 11 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.5-0.1.beta2
 - Update to 0.9.5-beta2.
 
 * Tue Mar 14 2006 Matthias Saou <http://freshrpms.net/> 5.1.x_0.9.3-0.3