summaryrefslogtreecommitdiffstats
path: root/php.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-11-22 07:39:19 +0100
committerRemi Collet <remi@remirepo.net>2018-11-22 07:39:19 +0100
commit017223a1e4841dab610a69b81c14348abee67e6c (patch)
treed9bd03e8fd0d137bbd39c7c211a1e107f29551a5 /php.spec
parent11dd2d528215ac2a5af1f992f86fa9a1796aadcc (diff)
v7.1.25RC1
Diffstat (limited to 'php.spec')
-rw-r--r--php.spec13
1 files changed, 7 insertions, 6 deletions
diff --git a/php.spec b/php.spec
index 6319d2b..cd31434 100644
--- a/php.spec
+++ b/php.spec
@@ -120,13 +120,13 @@
%global db_devel libdb-devel
%endif
-%global upver 7.1.24
-#global rcver RC1
+%global upver 7.1.25
+%global rcver RC1
Summary: PHP scripting language for creating dynamic web sites
Name: %{?scl_prefix}php
Version: %{upver}%{?rcver:~%{rcver}}
-Release: 2%{?dist}
+Release: 1%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -195,7 +195,6 @@ Patch300: php-7.0.10-datetests.patch
Patch301: php-7.0.0-oldpcre.patch
# WIP
-Patch400: https://patch-diff.githubusercontent.com/raw/php/php-src/pull/3666.patch
BuildRequires: bzip2-devel, curl-devel >= 7.9, %{db_devel}
BuildRequires: httpd-devel >= 2.0.46-1, pam-devel
@@ -919,7 +918,6 @@ if ! pkg-config libpcre --atleast-version 8.34 ; then
%patch301 -p1 -b .pcre834
fi
%endif
-%patch400 -p1 -b .pr3666
# WIP patch
@@ -1851,7 +1849,10 @@ fi
%changelog
-* Thu Nov 15 2018 Remi Collet <remi@remirepo.net> - 7.1.24-2
+* Thu Nov 22 2018 Remi Collet <remi@remirepo.net> - 7.1.25~RC1-1
+- update to 7.1.25RC1
+
+* Thu Nov 15 2018 Remi Collet <remi@remirepo.net> - 7.1.24-3
- test build for https://github.com/php/php-src/pull/3666
* Wed Nov 7 2018 Remi Collet <remi@remirepo.net> - 7.1.24-1