drop dependency on libidn, only use libicu

This commit is contained in:
Remi Collet 2017-05-09 13:18:55 +02:00
parent 5a70fd1a95
commit 572a49493e
1 changed files with 9 additions and 3 deletions

View File

@ -21,7 +21,7 @@
Name: php-pecl-http Name: php-pecl-http
Version: 3.1.0 Version: 3.1.0
Release: 3%{?dist} Release: 4%{?dist}
Summary: Extended HTTP support Summary: Extended HTTP support
License: BSD License: BSD
@ -40,7 +40,6 @@ BuildRequires: php-pear
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: zlib-devel >= 1.2.0.4 BuildRequires: zlib-devel >= 1.2.0.4
BuildRequires: curl-devel >= 7.18.2 BuildRequires: curl-devel >= 7.18.2
BuildRequires: libidn-devel
BuildRequires: libicu-devel BuildRequires: libicu-devel
BuildRequires: php-pecl-propro-devel >= 1.0.0 BuildRequires: php-pecl-propro-devel >= 1.0.0
BuildRequires: php-pecl-raphf-devel >= 1.1.0 BuildRequires: php-pecl-raphf-devel >= 1.1.0
@ -126,11 +125,15 @@ peclconf() {
--with-http \ --with-http \
--with-http-zlib-dir=%{_prefix} \ --with-http-zlib-dir=%{_prefix} \
--with-http-libcurl-dir=%{_prefix} \ --with-http-libcurl-dir=%{_prefix} \
--with-http-libidn-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-libicu-dir=%{_prefix} \
--with-http-libevent-dir=%{_prefix} \ --with-http-libevent-dir=%{_prefix} \
--with-libdir=%{_lib} \ --with-libdir=%{_lib} \
--with-php-config=$1 --with-php-config=$1
grep IDNA config.h
} }
cd NTS cd NTS
%{_bindir}/phpize %{_bindir}/phpize
@ -236,6 +239,9 @@ NO_INTERACTION=1 \
%changelog %changelog
* 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 * 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) - add missing BR on openssl-devel for new libcurl (FTBFS from Koschei)