rpms/php-magickwand/devel php-magickwand.spec,1.12,1.13

[Remi Collet]

Author: remi

Update of /cvs/extras/rpms/php-magickwand/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7133

Modified Files:
	php-magickwand.spec 
Log Message:
PHP 5.3.0 build


Index: php-magickwand.spec
===================================================================
RCS file: /cvs/extras/rpms/php-magickwand/devel/php-magickwand.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- php-magickwand.spec	10 Mar 2009 12:36:58 -0000	1.12
+++ php-magickwand.spec	13 Jul 2009 08:27:34 -0000	1.13
@@ -1,9 +1,10 @@
-%define default_apiver 20041225
+%global php_apiver	%((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%{!?php_extdir:		%{expand: %%global php_extdir %(php-config --extension-dir)}}
 
 Summary:	PHP API for ImageMagick
 Name:		php-magickwand
 Version:	1.0.8
-Release:	2%{?dist}
+Release:	3%{?dist}
 License:	ImageMagick
 Group:		Development/Languages
 # Only latest version is always kept on: http://www.magickwand.org/download/php/
@@ -11,7 +12,12 @@ Source0:	http://image_magick.veidrodis.c
 Source1:	magickwand.ini
 URL:		http://www.magickwand.org/
 BuildRequires:	php-devel >= 4.3.0, ImageMagick-devel >= 6.4.0, autoconf, automake, libtool
-Requires:	php-api = %((echo %{default_apiver}; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
+%if %{?php_zend_api}0
+Requires:	php(zend-abi) = %{php_zend_api}
+Requires:	php(api) = %{php_core_api}
+%else
+Requires:	php-api = %{php_apiver}
+%endif
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -46,10 +52,15 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc AUTHOR ChangeLog CREDITS LICENSE README TODO
-%{_libdir}/php/modules/magickwand.so
+%{php_extdir}/magickwand.so
 %config(noreplace) %{_sysconfdir}/php.d/magickwand.ini
 
 %changelog
+* Mon Jul 13 2009 Remi Collet <Fedora at FamilleCollet.com> 1.0.8-3
+- rebuild for new PHP 5.3.0 ABI (20090626)
+- better PHP ABI check
+- use php_extdir
+
 * Tue Mar 10 2009 Robert Scheck <robert at fedoraproject.org> 1.0.8-2
 - Rebuild against ImageMagick 6.4.9.6