.gitignore

@@ -12,7 +12,3 @@ clog
 /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

php-pecl-http.spec

@@ -1,44 +1,37 @@
 # Fedora spec file for php-pecl-http
 #
-# Copyright (c) 2012-2019 Remi Collet
+# Copyright (c) 2012-2016 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
-
 # 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}
 # after 20-iconv 40-propro 40-raphf
 %global ini_name  50-%{pecl_name}.ini
-%ifarch %{arm} aarch64
+%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
-
 Name:           php-pecl-http
-Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
+Version:        3.1.0
-Release:        2%{?dist}
+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-hash
 BuildRequires:  php-iconv
@@ -47,14 +40,12 @@ BuildRequires:  php-pear
 BuildRequires:  pcre-devel
 BuildRequires:  zlib-devel >= 1.2.0.4
 BuildRequires:  curl-devel >= 7.18.2
+BuildRequires:  libidn-devel
 BuildRequires:  libicu-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:       php(zend-abi) = %{php_zend_api}
 Requires:       php(api) = %{php_core_api}
@@ -66,12 +57,12 @@ Requires:       php-pecl(raphf)%{?_isa}  >= 1.1.0
 # V1 don't support PHP 5.6 https://bugs.php.net/66879
 Obsoletes:      php-pecl-http1 < 2
 
-Provides:       php-pecl(%{proj_name})         = %{version}
+Provides:       php-pecl(%{proj_name})         = %{version}%{?prever}
-Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}
+Provides:       php-pecl(%{proj_name})%{?_isa} = %{version}%{?prever}
-Provides:       php-pecl(%{pecl_name})         = %{version}
+Provides:       php-pecl(%{pecl_name})         = %{version}%{?prever}
-Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}
+Provides:       php-pecl(%{pecl_name})%{?_isa} = %{version}%{?prever}
-Provides:       php-%{pecl_name}               = %{version}
+Provides:       php-%{pecl_name}               = %{version}%{?prever}
-Provides:       php-%{pecl_name}%{?_isa}       = %{version}
+Provides:       php-%{pecl_name}%{?_isa}       = %{version}%{?prever}
 
 
 %description
@@ -93,6 +84,7 @@ Documentation : https://mdref.m6w6.name/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
 Obsoletes:     php-pecl-http1-devel < 2
@@ -106,13 +98,13 @@ These are the files needed to compile programs using HTTP extension.
 
 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
+if test "x${extver}" != "x%{version}%{?prever}"; then
-   : Error: Upstream HTTP version is now ${extver}, expecting %{upstream_version}%{?upstream_prever}%{?gh_date:dev}.
+   : Error: Upstream HTTP version is now ${extver}, expecting %{version}%{?prever}.
    : Update the pdover macro and rebuild.
    exit 1
 fi
@@ -132,16 +124,11 @@ peclconf() {
   --with-http \
   --with-http-zlib-dir=%{_prefix} \
   --with-http-libcurl-dir=%{_prefix} \
-  --without-http-libidn-dir \
+  --with-http-libidn-dir=%{_prefix} \
-  --without-http-libidn2-dir \
-  --without-http-libidnkit-dir \
-  --without-http-libidnkit2-dir \
   --with-http-libicu-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
@@ -184,14 +171,6 @@ done
 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
-
 # Shared needed extensions
 modules=""
 for mod in hash iconv propro raphf; do
@@ -255,72 +234,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)
 

sources

@@ -1 +1 @@
-SHA512 (pecl_http-3.2.1.tgz) = e67d4b32ba6f524e3fcf65f5497b94275e1a4a14fce97c57afe366369f368b3acdbedf364ed73cf983fb2c5f57f498adaa1100e7c936f11cbc5de1caedad7b51
+SHA512 (pecl_http-3.1.0.tgz) = 1c272aa476106bb61848f175f0ba6715b3d8928f70cdac1a673cc87c2dc780dff5434a3bc595d5e8a1ef7b847a1d2e214f9e9ae80b8b5d1f80a299febc85b0ea