Changes of Revision 2
| [+] | Deleted | php-pecl-xdebug.spec |
| @@ -1,121 +0,0 @@ -%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)}} - -%define pecl_name xdebug - -Name: php-pecl-xdebug -Version: 2.0.5 -Release: 1 -Summary: PECL package for debugging PHP scripts - -License: BSD -Group: Development/Languages -URL: http://pecl.php.net/package/xdebug -Source0: http://pecl.php.net/get/xdebug-%{version}.tgz -Patch0: %{pecl_name}-2.0.3-codecoverage.patch - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: automake php-devel php-pear >= 1:1.4.9-1.2 - -#BuildRequires: libedit-devel -%define config_flags --without-libedit - -Requires(post): %{__pecl} -Requires(postun): %{__pecl} -Provides: php-pecl(Xdebug) = %{version} - -%if 0%{?php_zend_api} -Requires: php(zend-abi) = %{php_zend_api} -Requires: php(api) = %{php_core_api} -%else -Requires: php-api = %{php_apiver} -%endif - -%description -The Xdebug extension helps you debugging your script by providing a lot -of valuable debug information. - - -%prep -%setup -qcn xdebug-%{version} -[ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pecl_name}-%{version}/%{pecl_name}.xml -cd xdebug-%{version} -%patch0 -p1 -b .codecoverage~ - -# fix rpmlint warnings -iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog -chmod -x *.[ch] - - -%build -cd xdebug-%{version} -phpize -%configure --enable-xdebug -CFLAGS="$RPM_OPT_FLAGS" make - -# Build debugclient -pushd debugclient -cp %{_datadir}/automake*/depcomp . -chmod +x configure -%configure %{config_flags} -CFLAGS="$RPM_OPT_FLAGS" make -popd - - -%install -cd xdebug-%{version} -rm -rf $RPM_BUILD_ROOT -make install INSTALL_ROOT=$RPM_BUILD_ROOT - -# install debugclient -install -d $RPM_BUILD_ROOT%{_bindir} -install -pm 755 debugclient/debugclient $RPM_BUILD_ROOT%{_bindir} - -# install config file -install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d -cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/xdebug.ini << 'EOF' -; Enable xdebug extension module -zend_extension=%{php_extdir}/xdebug.so -EOF - -# install doc files -install -d docs -install -pm 644 Changelog CREDITS LICENSE NEWS README docs - -# Install XML package description -install -d $RPM_BUILD_ROOT%{pecl_xmldir} -install -pm 644 %{pecl_name}.xml $RPM_BUILD_ROOT%{pecl_xmldir}/%{name}.xml - - -%if 0%{?pecl_install:1} -%post -%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : -%endif - - -%if 0%{?pecl_uninstall:1} -%postun -if [ $1 -eq 0 ] ; then - %{pecl_uninstall} %{pecl_name} >/dev/null || : -fi -%endif - - -%clean -rm -rf $RPM_BUILD_ROOT - - -%files -%defattr(-,root,root,-) -%doc xdebug-%{version}/docs/* -%config(noreplace) %{_sysconfdir}/php.d/xdebug.ini -%{php_extdir}/xdebug.so -%{_bindir}/debugclient -%{pecl_xmldir}/%{name}.xml - - -%changelog -* Wed Nov 25 2009 Nov Juergen Gotteswinter <jg@internetx.de> 2.0.5-1 -- initial bs import \ No newline at end of file | ||
| [-] | Added | php-pecl-xhprof.spec ^ |
|
x 1 2 +%global php_apiver %((echo 0; php -i 2>/dev/null | sed -n 's/^PHP API => //p') | tail -1)3 +%{!?__pecl: %{expand: %%global __pecl %{_bindir}/pecl}}4 +%{!?php_extdir: %{expand: %%global php_extdir %(php-config --extension-dir)}}5 +6 +%define pecl_name xhprof7 +8 +Name: php-pecl-xhprof9 +Version: 0.9.210 +Release: 111 +Summary: PECL package for debugging PHP scripts12 +13 +License: BSD14 +Group: Development/Languages15 +URL: http://pecl.php.net/package/xhprof16 +Source0: http://pecl.php.net/get/xhprof-%{version}.tgz17 +18 +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)19 +BuildRequires: automake php-devel php-pear >= 1:1.4.9-1.220 +21 +#BuildRequires: libedit-devel22 +%define config_flags --without-libedit23 +24 +Requires(post): %{__pecl}25 +Requires(postun): %{__pecl}26 +Provides: php-pecl(Xhprof) = %{version}27 +28 +%if 0%{?php_zend_api}29 +Requires: php(zend-abi) = %{php_zend_api}30 +Requires: php(api) = %{php_core_api}31 +%else32 +Requires: php-api = %{php_apiver}33 +%endif34 +35 +%description36 +37 +38 +%prep39 +%setup -qcn xhprof-%{version}40 +[ -f package2.xml ] || mv package.xml package2.xml41 +mv package2.xml %{pecl_name}-%{version}/%{pecl_name}.xml42 +cd xhprof-%{version}43 +44 +# fix rpmlint warnings45 +iconv -f iso8859-1 -t utf-8 Changelog > Changelog.conv && mv -f Changelog.conv Changelog46 +chmod -x *.[ch]47 +48 +49 +%build50 +cd extension51 +phpize52 +%configure --enable-xhprof53 +CFLAGS="$RPM_OPT_FLAGS" make54 +55 +%install56 +cd extension57 +rm -rf $RPM_BUILD_ROOT58 +%__make install DESTDIR=$RPM_BUILD_ROOT59 +60 +# install config file61 +install -d $RPM_BUILD_ROOT%{_sysconfdir}/php.d62 +cat > $RPM_BUILD_ROOT%{_sysconfdir}/php.d/xhprof.ini << 'EOF'63 +; Enable xhprof extension module64 +zend_extension=%{php_extdir}/xhprof.so65 +EOF66 +67 +# install doc files68 +install -d docs69 +install -pm 644 CHANGELOG CREDITS LICENSE README docs70 +71 +# Install XML package description72 +install -d $RPM_BUILD_ROOT%{pecl_xmldir}73 +install -pm 644 %{pecl_name}.xml $RPM_BUILD_ROOT%{pecl_xmldir}/%{name}.xml74 +75 +76 +%if 0%{?pecl_install:1}77 +%post78 +%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :79 +%endif80 +81 +82 +%if 0%{?pecl_uninstall:1}83 +%postun84 +if [ $1 -eq 0 ] ; then85 + %{pecl_uninstall} %{pecl_name} >/dev/null || :86 +fi87 +%endif88 +89 +90 +%clean91 +rm -rf $RPM_BUILD_ROOT92 +93 +94 +%files95 +%defattr(-,root,root,-)96 +%doc xhprof-%{version}/docs/*97 +%config(noreplace) %{_sysconfdir}/php.d/xhprof.ini98 +%{php_extdir}/xhprof.so99 +%{pecl_xmldir}/%{name}.xml100 +101 +102 +%changelog103 +* Thu Apr 14 2011 Carsten Schoene <cs@linux-administrator.com> - 0.9.2-1104 +- initial bs import105 |
||
| [+] | Deleted | xdebug-2.0.3-codecoverage.patch ^ |
| @@ -1,29 +0,0 @@ -diff -u xdebug-2.0.3-orig/xdebug_code_coverage.c xdebug-2.0.3/xdebug_code_coverage.c ---- xdebug-2.0.3-orig/xdebug_code_coverage.c 2008-04-09 10:52:03.000000000 -0400 -+++ xdebug-2.0.3/xdebug_code_coverage.c 2008-08-27 13:18:54.000000000 -0400 -@@ -133,7 +133,12 @@ - ) { - *jmp1 = position + 1; - #ifdef ZEND_ENGINE_2 -- *jmp2 = ((long) opcode.op2.u.jmp_addr - (long) base_address) / sizeof(zend_op); -+ /* if opline_num is smaller than base_address, use it directly */ -+ if ((long) opcode.op2.u.opline_num < (long) base_address) { -+ *jmp2 = opcode.op2.u.opline_num; -+ } else { -+ *jmp2 = ((long) opcode.op2.u.jmp_addr - (long) base_address) / sizeof(zend_op); -+ } - #else - *jmp2 = opcode.op1.u.opline_num; - #endif -@@ -163,6 +168,11 @@ - long jump_pos1 = -1; - long jump_pos2 = -1; - -+ /* Cancel if position is bigger than the actual size */ -+ if (position > opa->size) { -+ return; -+ } -+ - /*(fprintf(stderr, "Branch analysis from position: %d\n", position);)*/ - /* First we see if the branch has been visited, if so we bail out. */ - if (xdebug_set_in(set, position)) { | ||
| Deleted | xdebug-2.0.5.tgz ^ | |
| Added | xhprof-0.9.2.tgz ^ | |