repo reorg

4 files changed, 214 insertions, 0 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..1e65467
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+SRCDIR := $(shell pwd)
+NAME := $(shell basename $(SRCDIR))
+include ../common/Makefile
+
diff --git a/magickwand-php54.patch b/magickwand-php54.patch
new file mode 100644
index 0000000..885ea4e
--- /dev/null
+++ b/magickwand-php54.patch
@@ -0,0 +1,20 @@
+--- MagickWandForPHP-1.0.9/magickwand_inc.h.php54	2011-11-14 01:26:39.000000000 +0100
++++ MagickWandForPHP-1.0.9/magickwand_inc.h	2011-11-26 14:37:53.999059934 +0100
+@@ -61,7 +61,7 @@
+ 
+ static MagickBooleanType
+ 		   MW_zend_register_resource(
+-			   const MagickBooleanType verify, const void *obj_ptr, zval *zval_p, const int le_zend_rsrc_type, int *return_rsrc_id )
++			   const MagickBooleanType verify, const void *obj_ptr, zval *zval_p, const int le_zend_rsrc_type, int *return_rsrc_id TSRMLS_DC)
+ {
+ 	if ( verify == MagickFalse ) { return MagickFalse; }
+ 
+@@ -188,7 +188,7 @@
+ /* ************************************************************************************************************** */
+ 
+ #define MW_ZEND_REGISTER_RESOURCE( ResType, obj, zval_p, return_rsrc_id )  \
+-	MW_zend_register_resource( ResType ## _IS_GOOD( obj ), (void *) obj, zval_p, le_ ## ResType, return_rsrc_id )
++	MW_zend_register_resource( ResType ## _IS_GOOD( obj ), (void *) obj, zval_p, le_ ## ResType, return_rsrc_id TSRMLS_CC)
+ 
+ /* ************************************************************************************************************** */
+ 
diff --git a/magickwand.ini b/magickwand.ini
new file mode 100644
index 0000000..a1de9e7
--- /dev/null
+++ b/magickwand.ini
@@ -0,0 +1,2 @@
+; Enable magickwand extension module
+extension=magickwand.so
diff --git a/php-magickwand.spec b/php-magickwand.spec
new file mode 100644
index 0000000..8db7ac8
--- /dev/null
+++ b/php-magickwand.spec
@@ -0,0 +1,188 @@
+%global pecl_name magickwand
+
+Summary:       PHP API for ImageMagick
+Name:          php-magickwand
+Version:       1.0.9
+Release:       2%{?dist}
+License:       ImageMagick
+Group:         Development/Languages
+URL:           http://www.magickwand.org/
+# Only latest version is always kept on: http://www.magickwand.org/download/php/
+Source0:       http://image_magick.veidrodis.com/image_magick/php/MagickWandForPHP-%{version}.tar.bz2
+Source1:       magickwand.ini
+
+Patch0:        magickwand-php54.patch
+
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: php-devel >= 4.3.0, autoconf, automake, libtool
+%if 0%{?fedora} >= 14 || 0%{?rhel} >= 7
+BuildRequires: ImageMagick-devel >= 6.6.0
+%else
+BuildRequires: ImageMagick2-devel >= 6.6.0
+%endif
+
+Requires:      php(zend-abi) = %{php_zend_api}
+Requires:      php(api) = %{php_core_api}
+
+# RPM 4.8
+%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
+%{?filter_setup}
+# RPM 4.9
+%global __provides_exclude_from %{?__provides_exclude_from:%__provides_exclude_from|}%{_libdir}/.*\\.so$
+
+
+%description
+MagickWand for PHP is a native PHP interface to the new
+ImageMagick MagickWand API. It is an almost complete port
+of the ImageMagick C API, excluding some X-Server related
+functionality and progress monitoring.
+
+%prep
+%setup -q -c
+
+%patch0 -p0 -b .php54
+
+# fix version
+sed -i -e /MAGICKWAND_VERSION/s/1.0.8/1.0.9/ MagickWandForPHP-%{version}/magickwand.h
+
+# Check version
+extver=$(sed -n '/#define MAGICKWAND_VERSION/{s/.* "//;s/".*$//;p}' MagickWandForPHP-%{version}/magickwand.h)
+if test "x${extver}" != "x%{version}"; then
+   : Error: Upstream version is ${extver}, expecting %{version}.
+   exit 1
+fi
+
+# Fix incorrect end-of-line encoding
+sed -i 's/\r//' MagickWandForPHP-%{version}/README
+
+cp -pr MagickWandForPHP-%{version} MagickWandForPHP-%{version}-zts
+
+
+%build
+export PHP_RPATH=no
+
+cd MagickWandForPHP-%{version}
+%{_bindir}/phpize
+%configure --with-php-config=%{_bindir}/php-config
+make %{?_smp_mflags}
+
+cd ../MagickWandForPHP-%{version}-zts
+%{_bindir}/zts-phpize
+%configure --with-php-config=%{_bindir}/zts-php-config
+make %{?_smp_mflags}
+
+
+%install
+rm -rf %{buildroot}
+make -C MagickWandForPHP-%{version}     install-modules INSTALL_ROOT=%{buildroot}
+make -C MagickWandForPHP-%{version}-zts install-modules INSTALL_ROOT=%{buildroot}
+
+install -D -m 644 %{SOURCE1} %{buildroot}%{php_inidir}/%{pecl_name}.ini
+install -D -m 644 %{SOURCE1} %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
+
+
+%check
+# simple module load test
+%{__php} --no-php-ini \
+    --define extension_dir=MagickWandForPHP-%{version}/modules \
+    --define extension=%{pecl_name}.so \
+    --modules | grep %{pecl_name}
+
+%{__ztsphp} --no-php-ini \
+    --define extension_dir=MagickWandForPHP-%{version}-zts/modules \
+    --define extension=%{pecl_name}.so \
+    --modules | grep %{pecl_name}
+
+
+%clean
+rm -rf %{buildroot}
+
+
+%files
+%defattr(-,root,root,-)
+%doc MagickWandForPHP-%{version}/{AUTHOR,ChangeLog,CREDITS,LICENSE,README,TODO}
+%config(noreplace) %{php_inidir}/%{pecl_name}.ini
+%config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini
+%{php_extdir}/%{pecl_name}.so
+%{php_ztsextdir}/%{pecl_name}.so
+
+
+%changelog
+* Fri Apr 27 2012 Remi Collet <rpms@famillecollet.com> 1.0.9-2
+- fix macro usage
+
+* Sat Nov 26 2011 Remi Collet <rpms@famillecollet.com> 1.0.9-2
+- php 5.4 build
+
+* Sat Nov 26 2011 Remi Collet <rpms@famillecollet.com> 1.0.9-1
+- update to 1.0.9
+- patch for php 5.4 and ZTS build
+
+* Thu Oct 06 2011 Remi Collet <rpms@famillecollet.com> 1.0.8-10
+- ZTS extension
+- spec cleanups
+
+* Fri Nov 26 2010 Remi Collet <rpms@famillecollet.com> 1.0.8-8
+- rebuild against latest ImageMagick 6.6.5.10
+
+* Wed Sep 29 2010 jkeating - 1.0.8-8
+- Rebuilt for gcc bug 634757
+
+* Mon Sep 20 2010 Tom "spot" Callaway <tcallawa@redhat.com> 1.0.8-7
+- rebuild for new ImageMagick
+
+* Tue Feb 09 2010 Robert Scheck <robert@fedoraproject.org> 1.0.8-6
+- Rebuild against ImageMagick 6.6.0.2
+
+* Tue Aug 11 2009 Ville Skyttä <ville.skytta@iki.fi> - 1.0.8-5
+- Use bzipped upstream tarball.
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.8-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Remi Collet <Fedora@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@fedoraproject.org> 1.0.8-2
+- Rebuild against ImageMagick 6.4.9.6
+
+* Mon Feb 23 2009 Robert Scheck <robert@fedoraproject.org> 1.0.8-1
+- Upgrade to 1.0.8
+- Rebuild against gcc 4.4 and rpm 4.6
+
+* Sat May 17 2008 Robert Scheck <robert@fedoraproject.org> 1.0.7-2
+- Rebuild against ImageMagick 6.4.0.10
+
+* Sun Apr 27 2008 Robert Scheck <robert@fedoraproject.org> 1.0.7-1
+- Upgrade to 1.0.7
+
+* Thu Feb 14 2008 Robert Scheck <robert@fedoraproject.org> 1.0.6-2
+- Require ImageMagick >= 6.3.7.10 to avoid breakage (#432794)
+
+* Sat Feb 09 2008 Robert Scheck <robert@fedoraproject.org> 1.0.6-1
+- Upgrade to 1.0.6
+
+* Fri Dec 28 2007 Robert Scheck <robert@fedoraproject.org> 1.0.5-1
+- Upgrade to 1.0.5 (#229401)
+
+* Fri Dec 28 2007 Robert Scheck <robert@fedoraproject.org> 1.0.1-1
+- Upgrade to 1.0.1 (#394961)
+
+* Fri Dec 28 2007 Robert Scheck <robert@fedoraproject.org> 0.1.9-1
+- Upgrade to 0.1.9
+
+* Wed Aug 29 2007 Robert Scheck <robert@fedoraproject.org> 0.1.8-4
+- Updated the license tag according to the guidelines
+
+* Sun Sep 03 2006 Robert Scheck <robert@fedoraproject.org> 0.1.8-3
+- Rebuild for Fedora Core 6
+
+* Sat Jun 17 2006 Robert Scheck <robert@fedoraproject.org> 0.1.8-2
+- Changes to match with Fedora Packaging Guidelines (#194470)
+
+* Mon May 29 2006 Robert Scheck <robert@fedoraproject.org> 0.1.8-1
+- Upgrade to 0.1.8
+- Initial spec file for Fedora Core