v2.5.3

(cherry picked from commit f4b964733b)
v2.5.2
2015-09-28 07:20:12 +02:00 · 2015-09-10 10:08:27 +02:00 · 2015-07-28 16:22:11 +02:00 · 2015-07-15 15:14:47 +02:00
3 changed files with 81 additions and 155 deletions
--- a/.gitignore
+++ b/.gitignore
@ -7,12 +7,3 @@ clog
 /pecl_http-2.5.1.tgz
 /pecl_http-2.5.2.tgz
 /pecl_http-2.5.3.tgz
-/pecl_http-2.5.5.tgz
-/pecl_http-2.5.6.tgz
-/pecl_http-3.0.1.tgz
-/pecl_http-3.1.0.tgz
-/pecl_http-2.6.0.tgz
-/pecl_http-3.1.1RC1.tgz
-/pecl_http-3.2.0RC1.tgz
-/pecl_http-3.2.0.tgz
-/pecl_http-3.2.1.tgz
--- a/php-pecl-http.spec
+++ b/php-pecl-http.spec
@ -1,45 +1,49 @@
 # Fedora spec file for php-pecl-http
 #
-# Copyright (c) 2012-2019 Remi Collet
+# Copyright (c) 2012-2015 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
-
-# we don't want -z defs linker flag
-%undefine _strict_symbol_defs_build
+%{!?php_inidir:  %global php_inidir   %{_sysconfdir}/php.d}
+%{!?php_incldir: %global php_incldir  %{_includedir}/php}
+%{!?__pecl:      %global __pecl       %{_bindir}/pecl}
+%{!?__php:       %global __php        %{_bindir}/php}

 # The project is pecl_http but the extension is only http
 %global proj_name pecl_http
 %global pecl_name http
 %global with_zts  0%{?__ztsphp:1}
+%if "%{php_version}" < "5.6"
+# after hash iconv propro raphf
+%global ini_name  z-%{pecl_name}.ini
+%else
 # after 20-iconv 40-propro 40-raphf
 %global ini_name  50-%{pecl_name}.ini
-%ifarch %{arm} aarch64
+%endif
+%ifarch %{arm}
 # Test suite disabled because of erratic results on slow ARM (timeout)
 %global with_tests 0%{?_with_tests:1}
 %else
 %global with_tests 0%{!?_without_tests:1}
 %endif

-%global upstream_version 3.2.1
-#global upstream_prever  RC1
-
+#global prever RC1
 Name:           php-pecl-http
-Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        2%{?dist}
+Version:        2.5.3
+Release:        1%{?dist}
 Summary:        Extended HTTP support

 License:        BSD
+Group:          Development/Languages
 URL:            http://pecl.php.net/package/pecl_http
-Source0:        http://pecl.php.net/get/%{proj_name}-%{upstream_version}%{?upstream_prever}.tgz
+Source0:        http://pecl.php.net/get/%{proj_name}-%{version}%{?prever}.tgz

 # From http://www.php.net/manual/en/http.configuration.php
 Source1:        %{proj_name}.ini

-BuildRequires:  gcc
-BuildRequires:  php-devel >= 7
+BuildRequires:  php-devel >= 5.3.0
 BuildRequires:  php-hash
 BuildRequires:  php-iconv
 BuildRequires:  php-spl
@ -47,31 +51,52 @@ BuildRequires:  php-pear
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel >= 1.2.0.4
 BuildRequires:  curl-devel >= 7.18.2
-BuildRequires:  libicu-devel
+BuildRequires:  libidn-devel
 BuildRequires:  php-pecl-propro-devel >= 1.0.0
 BuildRequires:  php-pecl-raphf-devel  >= 1.1.0
 BuildRequires:  libevent-devel >= 1.4
-BuildRequires:  brotli-devel >= 1.0
 BuildRequires:  pkgconfig
-# only needed in F27+
-BuildRequires:  openssl-devel

+Requires(post): %{__pecl}
+Requires(postun): %{__pecl}
 Requires:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
+%if "%{php_version}" < "5.4"
+# php 5.3.3 in EL-6 don't use arched virtual provides
+# so only requires real packages instead
+Requires:       php-common%{?_isa}
+%else
 Requires:       php-hash%{?_isa}
 Requires:       php-iconv%{?_isa}
 Requires:       php-spl%{?_isa}
+%endif
 Requires:       php-pecl(propro)%{?_isa} >= 1.0.0
 Requires:       php-pecl(raphf)%{?_isa}  >= 1.1.0
+%if 0%{?fedora} < 22
+# new extensions split off this one.
+Requires:       php-pecl(json_post)%{?_isa}
+Requires:       php-pecl(apfd)%{?_isa}
+%endif
+%if "%{php_version}" > "5.6"
 # V1 don't support PHP 5.6 https://bugs.php.net/66879
 Obsoletes:      php-pecl-http1 < 2
+%else
+# Can't install both versions of the same extension
+Conflicts:      php-pecl-http1
+%endif

-Provides:       php-pecl(%{proj_name})         = %{version}
-Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}
-Provides:       php-pecl(%{pecl_name})         = %{version}
-Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}
-Provides:       php-%{pecl_name}               = %{version}
-Provides:       php-%{pecl_name}%{?_isa}       = %{version}
+Provides:       php-pecl(%{proj_name})         = %{version}%{?prever}
+Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
+Provides:       php-pecl(%{pecl_name})         = %{version}%{?prever}
+Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever}
+Provides:       php-%{pecl_name}               = %{version}%{?prever}
+Provides:       php-%{pecl_name}%{?_isa}       = %{version}%{?prever}
+
+%if 0%{?fedora} < 20 && 0%{?rhel} < 7
+# Filter shared private
+%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
+%endif
+%{?filter_setup}


 %description
@ -88,14 +113,23 @@ Also provided is a powerful request and parallel interface.

 Version 2 is completely incompatible to previous version.

-Documentation : https://mdref.m6w6.name/http
+Note:
+. php-pecl-http1 provides API version 1
+. php-pecl-http  provides API version 2
+
+Documentation : http://devel-m6w6.rhcloud.com/mdref/http


 %package devel
 Summary:       Extended HTTP support developer files (header)
+Group:         Development/Libraries
 Requires:      php-pecl-http%{?_isa} = %{version}-%{release}
 Requires:      php-devel%{?_isa} >= 5.3.0
+%if "%{php_version}" > "5.6"
 Obsoletes:     php-pecl-http1-devel < 2
+%else
+Conflicts:     php-pecl-http1-devel
+%endif

 %description devel
 These are the files needed to compile programs using HTTP extension.
@ -104,15 +138,12 @@ These are the files needed to compile programs using HTTP extension.
 %prep
 %setup -c -q 

-sed -e '/LICENSE/s/role="doc"/role="src"/' -i package.xml
-
-mv %{proj_name}-%{upstream_version}%{?upstream_prever} NTS
+mv %{proj_name}-%{version}%{?prever} NTS
 cd NTS
-sed -e '/WORDS_BIGENDIAN/s/if /ifdef /' -i src/php_http_etag.c

 extver=$(sed -n '/#define PHP_PECL_HTTP_VERSION/{s/.* "//;s/".*$//;p}' php_http.h)
-if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}%{?gh_date:dev}"; then
-   : Error: Upstream HTTP version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:dev}.
+if test "x${extver}" != "x%{version}%{?prever}"; then
+   : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}.
   : Update the pdover macro and rebuild.
   exit 1
 fi
@ -132,16 +163,10 @@ peclconf() {
  --with-http \
  --with-http-zlib-dir=%{_prefix} \
  --with-http-libcurl-dir=%{_prefix} \
-  --without-http-libidn-dir \
-  --without-http-libidn2-dir \
-  --without-http-libidnkit-dir \
-  --without-http-libidnkit2-dir \
-  --with-http-libicu-dir=%{_prefix} \
+  --with-http-libidn-dir=%{_prefix} \
  --with-http-libevent-dir=%{_prefix} \
-  --with-http-libbrotli-dir=%{_prefix} \
  --with-libdir=%{_lib} \
  --with-php-config=$1
-grep IDNA config.h
 }
 cd NTS
 %{_bindir}/phpize
@ -181,16 +206,12 @@ done


 %check
+%if "%{php_version}" < "5.4"
+# Known failed test with 5.3.3 (need investigations)
+export REPORT_EXIT_STATUS=0
+%else
 export REPORT_EXIT_STATUS=1
-export SKIP_ONLINE_TESTS=1
-
-: ignore tests with erratic results
-rm ?TS/tests/client021.phpt
-rm ?TS/tests/client022.phpt
-rm ?TS/tests/client027.phpt
-# sometime on s390x
-rm ?TS/tests/client016.phpt
-rm ?TS/tests/client028.phpt
+%endif

 # Shared needed extensions
 modules=""
@ -209,6 +230,7 @@ done
 %if %{with_tests}
 : Upstream test suite NTS extension
 cd NTS
+SKIP_ONLINE_TESTS=1 \
 TEST_PHP_EXECUTABLE=%{__php} \
 TEST_PHP_ARGS="-n $modules -d extension=$PWD/modules/%{pecl_name}.so" \
 NO_INTERACTION=1 \
@ -225,6 +247,7 @@ NO_INTERACTION=1 \
 %if %{with_tests}
 : Upstream test suite ZTS extension
 cd ../ZTS
+SKIP_ONLINE_TESTS=1 \
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
 TEST_PHP_ARGS="-n $modules -d extension=$PWD/modules/%{pecl_name}.so" \
 NO_INTERACTION=1 \
@ -233,8 +256,18 @@ NO_INTERACTION=1 \
 %endif


+%post
+%{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
+
+
+%postun
+if [ $1 -eq 0 ] ; then
+    %{pecl_uninstall} %{proj_name} >/dev/null || :
+fi
+
+
 %files
-%license NTS/LICENSE
+%{?_licensedir:%license NTS/LICENSE}
 %doc %{pecl_docdir}/%{proj_name}
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@ -255,98 +288,6 @@ NO_INTERACTION=1 \


 %changelog
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Fri Jun  7 2019 Remi Collet <remi@remirepo.net> - 3.2.1-1
- update to 3.2.1
-
-* Mon Feb  4 2019 Remi Collet <remi@remirepo.net> - 3.2.0-3
- ignore failed test with recent libcurl
-  reported as https://github.com/m6w6/ext-http/issues/84
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Thu Oct 11 2018 Remi Collet <remi@remirepo.net> - 3.2.0-2
- Rebuild for https://fedoraproject.org/wiki/Changes/php73
-
-* Thu Jul 19 2018 Remi Collet <remi@remirepo.net> - 3.2.0-1
- update to 3.2.0 (php 7, stable)
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0~RC1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Tue Jul 10 2018 Pete Walter <pwalter@fedoraproject.org> - 3.2.0~RC1-4
- Rebuild for ICU 62
-
-* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 3.2.0~RC1-3
- Rebuild for ICU 61.1
-
-* Mon Apr 30 2018 Pete Walter <pwalter@fedoraproject.org> - 3.2.0~RC1-2
- Rebuild for ICU 61.1
-
-* Tue Apr 10 2018 Remi Collet <remi@remirepo.net> - 3.2.0~RC1-1
- update to 3.2.0RC1
- enable brotli compression support
-
-* Thu Feb 15 2018 Remi Collet <remi@remirepo.net> - 3.1.1~RC1-5
- rebuild for libevent
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.1~RC1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Jan 29 2018 Remi Collet <remi@remirepo.net> - 3.1.1~RC1-3
- undefine _strict_symbol_defs_build
-
-* Thu Nov 30 2017 Pete Walter <pwalter@fedoraproject.org> - 3.1.1~RC1-2
- Rebuild for ICU 60.1
-
-* Tue Oct 03 2017 Remi Collet <remi@fedoraproject.org> - 3.1.1~RC1-1
- update to 3.1.1RC1
- rebuild for https://fedoraproject.org/wiki/Changes/php72
-
-* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue May  9 2017 Remi Collet <remi@remirepo.net> - 3.1.0-4
- drop dependency on libidn, only use libicu
-
-* Fri Apr 28 2017 Remi Collet <remi@fedoraproject.org> - 3.1.0-3
- add missing BR on openssl-devel for new libcurl (FTBFS from Koschei)
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.1.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Dec 12 2016 Remi Collet <remi@fedoraproject.org> - 3.1.0-1
- Update to 3.1.0 (php 7, stable)
-
-* Mon Nov 14 2016 Remi Collet <remi@fedoraproject.org> - 3.0.1-2
- rebuild for https://fedoraproject.org/wiki/Changes/php71
-
-* Mon Jun 27 2016 Remi Collet <remi@fedoraproject.org> - 3.0.1-1
- Update to 3.0.1 (php 7, stable)
-
-* Sat Mar 26 2016 Remi Collet <remi@fedoraproject.org> - 2.5.6-2
- add upstream patch to skip a online test
-  fix FTBFS detected by Koschei
-
-* Wed Mar  9 2016 Remi Collet <remi@fedoraproject.org> - 2.5.6-1
- Update to 2.5.6 (stable)
-
-* Wed Feb 10 2016 Remi Collet <remi@fedoraproject.org> - 2.5.5-3
- drop scriptlets (replaced by file triggers in php-pear)
- cleanup
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Dec  7 2015 Remi Collet <remi@fedoraproject.org> - 2.5.5-1
- Update to 2.5.5 (stable)
-
 * Fri Sep 25 2015 Remi Collet <remi@fedoraproject.org> - 2.5.3-1
 - Update to 2.5.3 (stable)

@ -360,12 +301,6 @@ NO_INTERACTION=1 \
 * Wed Jul 15 2015 Remi Collet <remi@fedoraproject.org> - 2.5.0-1
 - update to 2.5.0

-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.5.0-0.2.RC1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Fri May 22 2015 Remi Collet <remi@fedoraproject.org> - 2.5.0-0.1.RC1
- update to 2.5.0RC1 (beta)
-
 * Wed Apr 08 2015 Remi Collet <remi@fedoraproject.org> - 2.4.3-1
 - Update to 2.4.3
 - add dependencies on pecl/json_post and pecl/apfd (fedora < 22)
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (pecl_http-3.2.1.tgz) = e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
+faeaefd4c7800bcd9ced0883ebb3b733  pecl_http-2.5.3.tgz
Author	SHA1	Message	Date
Remi Collet	f763bf3f24	v2.5.3 (cherry picked from commit `f4b964733b`)	2015-09-28 07:20:12 +02:00
Remi Collet	c690f05ace	v2.5.2 (cherry picked from commit `5a4b06431c`)	2015-09-10 10:08:27 +02:00
Remi Collet	9a39981096	Update to 2.5.1 (stable) - raise dependency on raphf 1.1.0 (cherry picked from commit `d57e0625c3`)	2015-07-28 16:22:11 +02:00
Remi Collet	2b8d0f7f6e	v2.5.0	2015-07-15 15:14:47 +02:00