summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-17 15:19:43 +0200
committerRemi Collet <remi@remirepo.net>2019-09-17 15:19:43 +0200
commit2c6da699a1f4cb031b1f656d20e387550bf609ce (patch)
tree51adea3a84df4512fd7e8d8906fcb6293f27a15f
parent696f3f1c9e54dc00406b3badc01c355141f4f6f9 (diff)
test build
-rw-r--r--php.spec10
1 files changed, 7 insertions, 3 deletions
diff --git a/php.spec b/php.spec
index 16744c5..1612557 100644
--- a/php.spec
+++ b/php.spec
@@ -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: 19%{?dist}
+Release: 20%{?dist}
# All files licensed under PHP version 3.01, except
# Zend is licensed under Zend
# TSRM is licensed under BSD
@@ -174,7 +174,7 @@ Patch91: php-7.2.0-oci8conf.patch
Patch300: php-7.0.10-datetests.patch
# WIP
-Patch100: https://github.com/php/php-src/commit/56e880af9f90c9d313292c75eb6df58cc9e7e208.patch
+Patch100: https://github.com/php/php-src/commit/db094b4b2e5ef0f0c30f412ce3a2516e31e17da7.patch
BuildRequires: gnupg2
BuildRequires: bzip2-devel
@@ -946,7 +946,7 @@ sed -e 's/php-devel/%{?scl_prefix}php-devel/' -i scripts/phpize.in
%patch300 -p1 -b .datetests
# WIP patch
-%patch100 -p1 -R
+%patch100 -p1
# Prevent %%doc confusion over LICENSE files
cp Zend/LICENSE Zend/ZEND_LICENSE
@@ -1571,6 +1571,7 @@ install -m 644 -D macros.php \
rm -rf $RPM_BUILD_ROOT%{_libdir}/php/modules/*.a \
$RPM_BUILD_ROOT%{_bindir}/{phptar} \
$RPM_BUILD_ROOT%{_datadir}/pear \
+ $RPM_BUILD_ROOT%{_libdir}/libphp7.a \
$RPM_BUILD_ROOT%{_libdir}/libphp7.la
# Remove irrelevant docs
@@ -1789,6 +1790,9 @@ fi
%changelog
+* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-20
+- test build
+
* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 7.4.0~rc2-19
- update to 7.4.0RC2
- add tarball signature check