summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-05-04 09:03:49 +0200
committerRemi Collet <remi@remirepo.net>2020-05-04 09:03:49 +0200
commitddc66e9c9553b891c296858b16c086b51b82d364 (patch)
tree09c9b96687836fa48494d986a28807910db97a8d /php.spec
parent526d963ee4c432d68b518047d910942aac0f47d4 (diff)
new snapshot
enchant: use libenchant-2 instead of libenchant
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec15
1 files changed, 8 insertions, 7 deletions
diff --git a/php.spec b/php.spec
index c8b4ab0..dccb911 100644
--- a/php.spec
+++ b/php.spec
@@ -97,9 +97,9 @@
%global with_zip 0
-%global gh_commit d906eb23f6cc86c69f7edc2732d7a46901b992a3
+%global gh_commit 342754575237da912874f781a24eefe76434ce5a
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date 20200427
+%global gh_date 20200504
%global gh_owner php
%global gh_project php-src
%global upver 8.0.0
@@ -109,7 +109,7 @@
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?lower:~%{lower}}%{?gh_date:.%{gh_date}}
-Release: 7%{?dist}
+Release: 8%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -151,8 +151,6 @@ Patch5: php-7.2.0-includedir.patch
Patch6: php-7.4.0-embed.patch
Patch8: php-7.4.0-libdb.patch
Patch9: php-7.0.7-curl.patch
-# revert changes (already reverted upstream in 7.4)
-Patch10: php-8.0.0-static.patch
# Functional changes
Patch42: php-7.3.3-systzdata-v18.patch
@@ -841,7 +839,7 @@ Summary: Enchant spelling extension for PHP applications
License: PHP
Group: System Environment/Libraries
Requires: %{?scl_prefix}php-common%{?_isa} = %{version}-%{release}
-BuildRequires: pkgconfig(enchant)
+BuildRequires: pkgconfig(enchant-2)
%description enchant
The %{?scl_prefix}php-enchant package contains a dynamic shared object that will add
@@ -932,7 +930,6 @@ in pure PHP.
%if 0%{?rhel}
%patch9 -p1 -b .curltls
%endif
-%patch10 -p1 -b .revert
%if 0%{?fedora} >= 28 || 0%{?rhel} >= 6
%patch42 -p1 -b .systzdata
@@ -1817,6 +1814,10 @@ fi
%changelog
+* Mon May 4 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200504-8
+- new snapshot
+- enchant: use libenchant-2 instead of libenchant
+
* Tue Apr 28 2020 Remi Collet <remi@remirepo.net> - 8.0.0~DEV.20200428-7
- new snapshot
- test build for https://github.com/php/php-src/pull/5480