php-pecl-parsekit: clean and rebuild for remi repo

1 files changed, 116 insertions, 67 deletions

diff --git a/php-pecl-parsekit.spec b/php-pecl-parsekit.spec
index e9eae03..d31d3cf 100644
--- a/php-pecl-parsekit.spec
+++ b/php-pecl-parsekit.spec
@@ -1,98 +1,147 @@
-%global	php_apiver  %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)
-%{!?__pecl:		%{expand:	%%global __pecl	%{_bindir}/pecl}}
-%{!?php_extdir:	%{expand:	%%global php_extdir	%(php-config --extension-dir)}}
-
-%global	CVS	20120226
-%global	peclName	parsekit
-
-Summary:		PHP Opcode Analyser
-Name:		php-pecl-%peclName
-Version:		1.3
-Release:		2%{?CVS:.CVS%{CVS}}%{?dist}
-License:		PHP
-Group:		Development/Libraries
+%{!?__pecl:      %{expand:   %%global __pecl   %{_bindir}/pecl}}
+
+%global   CVS        20120226
+%global   pecl_name  parsekit
+
+Summary:       PHP Opcode Analyser
+Name:          php-pecl-parsekit
+Version:       1.3
+Release:       2%{?CVS:.CVS%{CVS}}%{?dist}
+License:       PHP
+URL:           http://pecl.php.net/package/parsekit
+Group:         Development/Libraries
 %if 0%{?CVS:1}
-# cvs -d :pserver:cvsread@cvs.php.net/repository export -D 2009-03-09 pecl/parsekit ; tar cjf parsekit-1.2-CVS20090309.tar.bz2 -C pecl parsekit
-Source0:		%{peclName}-%{version}-CVS%{CVS}.tar.bz2
+# cvs -d :pserver:cvsread@cvs.php.net/repository export -D 2009-03-09 pecl/parsekit
+# tar cjf parsekit-1.2-CVS20090309.tar.bz2 -C pecl parsekit
+Source0:      %{pecl_name}-%{version}-CVS%{CVS}.tar.bz2
 %else
-Source0:		http://pecl.php.net/get/%{peclName}-%{version}.tgz
+Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 %endif
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-URL:			http://pecl.php.net/package/%peclName
-BuildRequires: php-pear >= 1.4.7 php-devel
 
-%if 0%{?php_zend_api:1}
-Requires:		php(zend-abi) = %{php_zend_api}
-Requires:		php(api) = %{php_core_api}
-%else
-Requires:		php-api = %{php_apiver}
+# https://bugs.php.net/bug.php?id=61187
+Patch1:        php-pecl-parsekit-1.3-php-5.4.patch
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: php-pear
+BuildRequires: php-devel
+
+Requires(post): %{__pecl}
+Requires(postun): %{__pecl}
+
+Requires:      php(zend-abi) = %{php_zend_api}
+Requires:      php(api) = %{php_core_api}
+
+Provides:      php-pecl(%{pecl_name}) = %{version}
+Provides:      php-pecl(%{pecl_name})%{?_isa} = %{version}
+
+# Other third party repo stuff
+Obsoletes:     php53-pecl-parsekit
+Obsoletes:     php53u-pecl-parsekit
+%if "%{php_version}" > "5.4"
+Obsoletes:     php54-pecl-parsekit
 %endif
-Provides:		php-pecl(%peclName) = %{version}
 
-Requires(post):	%{__pecl}
-Requires(postun):	%{__pecl}
+# filter private shared
+%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
+%{?filter_setup}
 
-# https://bugs.php.net/bug.php?id=61187
-Patch1:		php-pecl-parsekit-1.3-php-5.4.patch
 
 %description
 Provides a userspace interpretation of the opcodes generated by the Zend engine
 compiler built into PHP.
+
 This extension is meant for development and debug purposes only and contains
 some code which is potentially non-threadsafe.
 
+
 %prep
-#%setup -qc -n %peclName-%{version}
 %setup -qc
 
 %patch1 -p1 -b .php5.4
 
+# Create configuration file
+cat <<'EOF' > %{pecl_name}.ini
+; Enable %{pecl_name} extension module
+extension=%{pecl_name}.so
+EOF
+
+cp -r %{pecl_name} %{pecl_name}-zts
+
+
 %build
-cd %peclName
-phpize
-%{configure} --with-%peclName
-%{__make}
+cd %{pecl_name}
+%{_bindir}/phpize
+%configure \
+    --with-%{pecl_name}\
+    --with-php-config=%{_bindir}/php-config
+make %{?_smp_mflags}
+
+cd ../%{pecl_name}-zts
+%{_bindir}/zts-phpize
+%configure \
+    --with-%{pecl_name}\
+    --with-php-config=%{_bindir}/zts-php-config
+make %{?_smp_mflags}
+
 
 %install
-cd %peclName
 rm -rf %{buildroot}
 
-%{__make} install \
-	INSTALL_ROOT=%{buildroot}
+make install -C %{pecl_name}     install INSTALL_ROOT=%{buildroot}
+make install -C %{pecl_name}-zts install INSTALL_ROOT=%{buildroot}
+
+# Drop in the bit of configuration
+install -Dpm 644 %{pecl_name}.ini %{buildroot}%{php_inidir}/%{pecl_name}.ini
+install -Dpm 644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/%{pecl_name}.ini
 
 # Install XML package description
-install -m 0755 -d %{buildroot}%{pecl_xmldir}
-install -m 0664 package.xml %{buildroot}%{pecl_xmldir}/%peclName.xml
-install -d %{buildroot}%{_sysconfdir}/php.d/
+install -Dpm 0664 %{pecl_name}/package2.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
+
+
+%check
+# No test provided, just minimal load test
+%{__php} --no-php-ini \
+    --define extension_dir=%{buildroot}%{php_extdir} \
+    --define extension=%{pecl_name}.so \
+    -m | grep %{pecl_name}
+
+%{__ztsphp} --no-php-ini \
+    --define extension_dir=%{buildroot}%{php_ztsextdir} \
+    --define extension=%{pecl_name}.so \
+    -m | grep %{pecl_name}
 
-cat <<'EOF' > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/%peclName.ini
-; Enable %{peclName} extension module
-extension=%{peclName}.so
-EOF
 
 %post
-%if 0%{?pecl_install:1}
-%{pecl_install} %{pecl_xmldir}/%{peclName}.xml >/dev/null || :
-%endif
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
 
 %postun
-%if 0%{?pecl_uninstall:1}
 if [ $1 -eq 0 ] ; then
-	%{pecl_uninstall} %{peclName} >/dev/null || :
+   %{pecl_uninstall} %{pecl_name} >/dev/null || :
 fi
-%endif
+
 
 %clean
 rm -rf %{buildroot}
 
+
 %files
 %defattr(-,root,root,-)
-%doc %peclName/examples/{compile_file.php,compile_string.php,compile_string_show_errors.php} %peclName/README
-%{php_extdir}/%peclName.so
-%{pecl_xmldir}/%peclName.xml
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/php.d/%peclName.ini
+%doc %{pecl_name}/examples %{pecl_name}/README
+%{pecl_xmldir}/%{name}.xml
+
+%{php_extdir}/%{pecl_name}.so
+%config(noreplace) %{php_inidir}/%{pecl_name}.ini
+
+%{php_ztsextdir}/%{pecl_name}.so
+%config(noreplace) %{php_ztsinidir}/%{pecl_name}.ini
+
 
 %changelog
+* Wed Sep 12 2012 Remi Collet <remi@fedoraproject.org> - 1.3-2.CVS20120226
+- standardize for remi repo, lot of cleanups
+- add ZTS extension
+- add %%check section: minimal load test
+
 * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-2.CVS20120226
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
@@ -102,11 +151,11 @@ rm -rf %{buildroot}
 * Sun Feb 26 2012 Pavel Alexeev <Pahan@Hubbitus.info> 1.3-0.1.CVS20120226
 - Update to 1.3 branch, try fix FBFS on PHP 5.4.
 - Urls by patch wrote:
-	https://bugs.php.net/bug.php?id=61187
-	http://fossies.org/unix/www/php-5.4.0RC8.tar.gz:a/php-5.4.0RC8/NEWS
-	http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/Zend/zend_compile.h?r1=298202&r2=298203&
-	http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/Zend/zend_compile.h?annotate=321634
-	http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/Zend/zend_compile.h?r1=301081&r2=303381
+   https://bugs.php.net/bug.php?id=61187
+   http://fossies.org/unix/www/php-5.4.0RC8.tar.gz:a/php-5.4.0RC8/NEWS
+   http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/Zend/zend_compile.h?r1=298202&r2=298203&
+   http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/Zend/zend_compile.h?annotate=321634
+   http://svn.php.net/viewvc/php/php-src/branches/PHP_5_4/Zend/zend_compile.h?r1=301081&r2=303381
 - Add patch php-pecl-parsekit-1.3-php-5.4.patch
 
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-8.CVS20090309
@@ -143,18 +192,18 @@ rm -rf %{buildroot}
 - Fix several inconsistent macros usages.
 - Add standard Requires/provides of php-api, abi, zend abi, php-pecl(%%peclName) = %%{version}...
 - Delete pathces, which is not needed anymore in ew checkout.
-- Remove Obsoletes:	php-pear-%%peclName
-- Add Requires(post):	%%{__pecl} and Requires(postun):	%%{__pecl}
+- Remove Obsoletes:   php-pear-%%peclName
+- Add Requires(post):   %%{__pecl} and Requires(postun):   %%{__pecl}
 - Rpmlint warnings:
-	o Mixed spaces turned to tabs.
-	o Descrioption line too long: splited.
-	o License from "PHP License" changed to just PHP
-	o script-without-shebang /usr/share/pear/.pkgxml/parsekit.xml: chmod to 0664
+   o Mixed spaces turned to tabs.
+   o Descrioption line too long: splited.
+   o License from "PHP License" changed to just PHP
+   o script-without-shebang /usr/share/pear/.pkgxml/parsekit.xml: chmod to 0664
 
 * Tue May 13 2008 Pavel Alexeev <Pahan [ at ] Hubbitus [ DOT ] spb [ dOt.] su> - 1.2-0.CVS20080513.Hu.0
 - Initial spec (copy of php-pecl-imagick.Hu.spec)
 - Add (import from runkit spec-file) CVS-build support
 - Add patches:
-	Patch0:		php-pecl-parsekit-php51.patch (http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg28512.html)
-	Patch1:		php-pecl-parsekit-1.2-PHP5.3.0.patch (self)
+   Patch0:      php-pecl-parsekit-php51.patch (http://www.mail-archive.com/pld-cvs-commit@lists.pld-linux.org/msg28512.html)
+   Patch1:      php-pecl-parsekit-1.2-PHP5.3.0.patch (self)
 - Post and Pustun steps replaced by it is macroses-representated form (from php-pecl-phar)