summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--php.spec17
1 files changed, 11 insertions, 6 deletions
diff --git a/php.spec b/php.spec
index 9bd59cb..b351395 100644
--- a/php.spec
+++ b/php.spec
@@ -96,9 +96,9 @@
%global with_zip 0
-%global gh_commit 8f854c109927019192721a890ed7f201db1e2f87
+%global gh_commit eac238fb6cb6f38c2f3ba1d0fa129ea8d42fec38
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date 20190605
+%global gh_date 20190612
%global gh_owner php
%global gh_project php-src
%global upver 7.4.0
@@ -108,7 +108,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 6%{?dist}
+Release: 7%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -205,7 +205,7 @@ BuildRequires: libtool-ltdl-devel
%if %{with_dtrace}
BuildRequires: %{?dtsprefix}systemtap-sdt-devel
%endif
-BuildRequires: libargon2-devel
+BuildRequires: pkgconfig(libargon2)
%if 0%{?gh_date}
BuildRequires: bison
BuildRequires: re2c
@@ -438,7 +438,7 @@ Group: Development/Languages
# All files licensed under PHP version 3.01
License: PHP
Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
-BuildRequires: cyrus-sasl-devel
+BuildRequires: pkgconfig(libsasl2)
BuildRequires: openldap-devel
BuildRequires: openssl-devel >= 1.0.1
@@ -647,7 +647,8 @@ Provides: %{?scl_prefix}php-simplexml, %{?scl_prefix}php-simplexml%{?_isa}
Provides: %{?scl_prefix}php-xmlreader, %{?scl_prefix}php-xmlreader%{?_isa}
Provides: %{?scl_prefix}php-xmlwriter, %{?scl_prefix}php-xmlwriter%{?_isa}
Provides: %{?scl_prefix}php-xsl, %{?scl_prefix}php-xsl%{?_isa}
-BuildRequires: libxslt-devel >= 1.0.18-1
+BuildRequires: pkgconfig(libxslt) >= 1.1
+BuildRequires: pkgconfig(libexslt)
BuildRequires: pkgconfig(libxml-2.0) >= 2.7.6
%description xml
@@ -1796,6 +1797,10 @@ fi
%changelog
+* Wed Jun 5 2019 Remi Collet <remi@remirepo.net> - 7.4.0~DEV.20190612-7
+- new snapshot
+- use pkgconfig dependencies for libxslt, libexslt, libsasl2, libargon2
+
* Wed Jun 5 2019 Remi Collet <remi@remirepo.net> - 7.4.0~DEV.20190605-6
- new snapshot