diff --git a/.gitignore b/.gitignore index d80b275..60decd5 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ php-pecl-http.spec~ /pecl_http-2.0.3.tgz /pecl_http-2.0.4.tgz /pecl_http-2.0.5.tgz +/pecl_http-2.0.6.tgz diff --git a/php-pecl-http.spec b/php-pecl-http.spec index 0dc5b43..7b3532a 100644 --- a/php-pecl-http.spec +++ b/php-pecl-http.spec @@ -15,9 +15,16 @@ %global proj_name pecl_http %global pecl_name http %global with_zts 0%{?__ztsphp:1} +%if 0%{?fedora} < 21 +# after json hash iconv propro raphf +%global ini_name z-%{pecl_name}.ini +%else +# after 40-json 20-iconv 40-propro 40-raphf +%global ini_name 50-%{pecl_name}.ini +%endif Name: php-pecl-http -Version: 2.0.5 +Version: 2.0.6 Release: 1%{?dist} Summary: Extended HTTP support @@ -119,7 +126,7 @@ if test "x${extver}" != "x%{version}%{?prever}"; then fi cd .. -cp %{SOURCE1} %{pecl_name}.ini +cp %{SOURCE1} %{ini_name} %if %{with_zts} # Duplicate source tree for NTS / ZTS build @@ -157,11 +164,11 @@ make -C NTS install INSTALL_ROOT=%{buildroot} install -Dpm 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml # install config file (z-http.ini to be loaded after json) -install -Dpm644 %{pecl_name}.ini %{buildroot}%{php_inidir}/z-%{pecl_name}.ini +install -Dpm644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name} %if %{with_zts} make -C ZTS install INSTALL_ROOT=%{buildroot} -install -Dpm644 %{pecl_name}.ini %{buildroot}%{php_ztsinidir}/z-%{pecl_name}.ini +install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif # Test & Documentation @@ -210,12 +217,12 @@ fi %files %doc %{pecl_docdir}/%{proj_name} -%config(noreplace) %{php_inidir}/z-%{pecl_name}.ini +%config(noreplace) %{php_inidir}/%{ini_name} %{php_extdir}/%{pecl_name}.so %{pecl_xmldir}/%{name}.xml %if %{with_zts} -%config(noreplace) %{php_ztsinidir}/z-%{pecl_name}.ini +%config(noreplace) %{php_ztsinidir}/%{ini_name} %{php_ztsextdir}/%{pecl_name}.so %endif @@ -229,6 +236,9 @@ fi %changelog +* Thu Apr 24 2014 Remi Collet - 2.0.6-1 +- Update to 2.0.6 + * Fri Apr 04 2014 Remi Collet - 2.0.5-1 - Update to 2.0.5 diff --git a/sources b/sources index 2f53616..dfc90ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14715aedd483c0ebdd08b56c00c4c5bf pecl_http-2.0.5.tgz +0f1f35e79c7b4be2a5230123edc7c760 pecl_http-2.0.6.tgz