summaryrefslogtreecommitdiffstats
path: root/php-componere.spec
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-09-06 11:46:00 +0200
committerRemi Collet <remi@remirepo.net>2019-09-06 11:46:00 +0200
commit52808b86cde524c9a6f84fc3fdd62ed56b3df08b (patch)
treeb25988fdfb5217147a879e99a29b39fe1ea03248 /php-componere.spec
parentedc3c14691d18c4b63c4c07cc12ed2075c296b95 (diff)
add upstream patches for 7.4.0RC1
Diffstat (limited to 'php-componere.spec')
-rw-r--r--php-componere.spec12
1 files changed, 11 insertions, 1 deletions
diff --git a/php-componere.spec b/php-componere.spec
index 0b64fab..d75d5f9 100644
--- a/php-componere.spec
+++ b/php-componere.spec
@@ -19,14 +19,18 @@
Summary: Composing PHP classes at runtime
Name: %{?scl_prefix}php-componere
Version: 3.1.0
-Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 4%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP
URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: http://pecl.php.net/get/%{pecl_name}-%{version}.tgz
+Patch0: https://github.com/krakjoe/componere/commit/95120639f0bfb6d4a6fe076ddf1b3016eda5e664.patch
+Patch1: https://github.com/krakjoe/componere/commit/0f16925652b49bdefaa0ae2264446a845a5bb109.patch
+
BuildRequires: %{?dtsprefix}gcc
BuildRequires: %{?scl_prefix}php-devel > 7.1
BuildRequires: %{?scl_prefix}php-pear
+#BuildRequires: gdb php-debuginfo php-cli-debuginfo php-debugsource
Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
Requires: %{?scl_prefix}php(api) = %{php_core_api}
@@ -94,6 +98,9 @@ sed -e 's/role="test"/role="src"/' \
-i package.xml
cd NTS
+%patch0 -p1 -b .up1
+%patch1 -p1 -b .up2
+
# Sanity check, really often broken
extver=$(sed -n '/define PHP_COMPONERE_VERSION/{s/.* "//;s/".*$//;p}' php_componere.h)
if test "x${extver}" != "x%{version}"; then
@@ -201,6 +208,9 @@ REPORT_EXIT_STATUS=1 \
%changelog
+* Fri Sep 6 2019 Remi Collet <remi@remirepo.net> - 3.1.0-4
+- add upstream patches for 7.4.0RC1
+
* Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 3.1.0-3
- rebuild for 7.4.0RC1