Author: glen Date: Mon Aug 30 15:43:51 2010 GMT Module: packages Tag: HEAD ---- Log message: - fix macros usage if ZTS is disabled
---- Files affected: packages/php-ioncube: php-ioncube.spec (1.13 -> 1.14) packages/php-pecl-apd: php-pecl-apd.spec (1.20 -> 1.21) packages/php-pecl-xdebug: php-pecl-xdebug.spec (1.62 -> 1.63) packages/php4-pecl-xdebug: php4-pecl-xdebug.spec (1.1 -> 1.2) ---- Diffs: ================================================================ Index: packages/php-ioncube/php-ioncube.spec diff -u packages/php-ioncube/php-ioncube.spec:1.13 packages/php-ioncube/php-ioncube.spec:1.14 --- packages/php-ioncube/php-ioncube.spec:1.13 Thu Aug 26 14:46:17 2010 +++ packages/php-ioncube/php-ioncube.spec Mon Aug 30 17:43:46 2010 @@ -26,7 +26,7 @@ # Source2-md5: 2d58162a83a10574c334716c352b9e34 URL: http://www.ioncube.com/ BuildRequires: php-devel >= 4:5.0.4 -BuildRequires: rpmbuild(macros) >= 1.566 +BuildRequires: rpmbuild(macros) >= 1.578 BuildRequires: sed >= 4.0 %{?requires_php_extension} ExclusiveArch: %{ix86} %{x8664} ppc @@ -50,7 +50,7 @@ %endif %undos *.txt -mv ioncube_loader_lin_%{php_major_version}.%{php_minor_version}%{?zend_zts:_ts}.so %{modname}.so +mv ioncube_loader_lin_%{php_major_version}.%{php_minor_version}%{?zend_zts}.so %{modname}.so ver=$(strings %{modname}.so | grep -F %{version}) if [ "$ver" != "%{version}" ]; then exit 1 @@ -63,7 +63,7 @@ install -p %{modname}.so $RPM_BUILD_ROOT%{php_extensiondir} cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{modname}.ini ; Enable %{modname} extension module -zend_extension%{?zend_zts:_ts}=%{php_extensiondir}/%{modname}.so +zend_extension%{?zend_zts}=%{php_extensiondir}/%{modname}.so EOF %clean @@ -89,6 +89,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.14 2010/08/30 15:43:46 glen +- fix macros usage if ZTS is disabled + Revision 1.13 2010/08/26 12:46:17 arekm - up to 3.3.20 ================================================================ Index: packages/php-pecl-apd/php-pecl-apd.spec diff -u packages/php-pecl-apd/php-pecl-apd.spec:1.20 packages/php-pecl-apd/php-pecl-apd.spec:1.21 --- packages/php-pecl-apd/php-pecl-apd.spec:1.20 Sun Apr 26 19:20:09 2009 +++ packages/php-pecl-apd/php-pecl-apd.spec Mon Aug 30 17:43:46 2010 @@ -13,7 +13,7 @@ Patch0: %{name}-cvs.patch URL: http://pecl.php.net/package/apd/ BuildRequires: php-devel >= 3:5.0.0 -BuildRequires: rpmbuild(macros) >= 1.344 +BuildRequires: rpmbuild(macros) >= 1.578 %{?requires_zend_extension} Requires: php-common >= 4:5.0.4 Obsoletes: php-pear-%{_modname} @@ -51,7 +51,7 @@ install %{_modname}-%{version}/modules/%{_modname}.so $RPM_BUILD_ROOT%{php_extensiondir} cat <<'EOF' > $RPM_BUILD_ROOT%{php_sysconfdir}/conf.d/%{_modname}.ini ; Enable %{_modname} extension module -zend_extension%{?zend_zts:_ts}=%{_modname}.so +zend_extension%{?zend_zts}=%{_modname}.so EOF %clean @@ -77,6 +77,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2010/08/30 15:43:46 glen +- fix macros usage if ZTS is disabled + Revision 1.20 2009/04/26 17:20:09 adamg - license fixes Andrzej Mateja <amateja () pimpek.one.pl> ================================================================ Index: packages/php-pecl-xdebug/php-pecl-xdebug.spec diff -u packages/php-pecl-xdebug/php-pecl-xdebug.spec:1.62 packages/php-pecl-xdebug/php-pecl-xdebug.spec:1.63 --- packages/php-pecl-xdebug/php-pecl-xdebug.spec:1.62 Mon Aug 30 17:22:25 2010 +++ packages/php-pecl-xdebug/php-pecl-xdebug.spec Mon Aug 30 17:43:46 2010 @@ -15,7 +15,7 @@ BuildRequires: libedit-devel BuildRequires: libtool BuildRequires: php-devel >= 4:5.0.4 -BuildRequires: rpmbuild(macros) >= 1.519 +BuildRequires: rpmbuild(macros) >= 1.578 %{?requires_zend_extension} Conflicts: ZendOptimizer BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -66,7 +66,7 @@ mv %{modname}-%{version}*/* . chmod +x debugclient/configure -%{__sed} -e 's#^;zend_extension.*#zend_extension%{?zend_zts:_ts}=%{php_extensiondir}/%{modname}.so#' %{SOURCE1} > %{modname}.ini +%{__sed} -e 's#^;zend_extension.*#zend_extension%{?zend_zts}=%{php_extensiondir}/%{modname}.so#' %{SOURCE1} > %{modname}.ini %build # libtool 2.2 build fix @@ -130,6 +130,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.63 2010/08/30 15:43:46 glen +- fix macros usage if ZTS is disabled + Revision 1.62 2010/08/30 15:22:25 glen - up to 2.1.0-release ================================================================ Index: packages/php4-pecl-xdebug/php4-pecl-xdebug.spec diff -u packages/php4-pecl-xdebug/php4-pecl-xdebug.spec:1.1 packages/php4-pecl-xdebug/php4-pecl-xdebug.spec:1.2 --- packages/php4-pecl-xdebug/php4-pecl-xdebug.spec:1.1 Wed Feb 6 20:46:27 2008 +++ packages/php4-pecl-xdebug/php4-pecl-xdebug.spec Mon Aug 30 17:43:46 2010 @@ -17,7 +17,7 @@ BuildRequires: libedit-devel BuildRequires: libtool BuildRequires: php4-devel >= 3:4.1.0 -BuildRequires: rpmbuild(macros) >= 1.344 +BuildRequires: rpmbuild(macros) >= 1.578 Requires: %{_sysconfdir}/conf.d %{?requires_zend_extension} Conflicts: ZendOptimizer @@ -69,7 +69,7 @@ %setup -q -c chmod +x %{_modname}-%{version}/debugclient/configure cp %{SOURCE1} %{_modname}.ini -sed -e 's#^;zend_extension.*#zend_extension%{?zend_zts:_ts}=%{extensionsdir}/%{_modname}.so#' -i %{_modname}.ini +sed -e 's#^;zend_extension.*#zend_extension%{?zend_zts}=%{extensionsdir}/%{_modname}.so#' -i %{_modname}.ini %build cd %{_modname}-%{version} @@ -117,6 +117,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2010/08/30 15:43:46 glen +- fix macros usage if ZTS is disabled + Revision 1.1 2008/02/06 19:46:27 jezik - clone of php-pecl-xdebug modified to work with php4 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-ioncube/php-ioncube.spec?r1=1.13&r2=1.14&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pecl-apd/php-pecl-apd.spec?r1=1.20&r2=1.21&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php-pecl-xdebug/php-pecl-xdebug.spec?r1=1.62&r2=1.63&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/php4-pecl-xdebug/php4-pecl-xdebug.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
