From 8e9422b065b867a366fde3626ea5697fe05aec89 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 25 Aug 2020 11:16:36 +0200
Subject: add patches for PHP8 from   https://github.com/bukka/php-fann/pull/42
   https://github.com/bukka/phpc/pull/1

---
 php-pecl-fann.spec | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'php-pecl-fann.spec')

diff --git a/php-pecl-fann.spec b/php-pecl-fann.spec
index ddb79c6..5adbc21 100644
--- a/php-pecl-fann.spec
+++ b/php-pecl-fann.spec
@@ -3,7 +3,7 @@
 #
 # Fedora spec file for php-pecl-fann
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -27,12 +27,16 @@
 Summary:        Wrapper for FANN Library
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.1.1
-Release:        14%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        17%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
-URL:            http://pecl.php.net/package/%{pecl_name}
-Source0:        http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
+URL:            https://pecl.php.net/package/%{pecl_name}
+Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
+# fann patches
 Patch0:         https://patch-diff.githubusercontent.com/raw/bukka/php-fann/pull/38.patch
+Patch1:         https://patch-diff.githubusercontent.com/raw/bukka/php-fann/pull/42.patch
+# phpc cumulative patch
+Patch10:        phpc.patch
 
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  fann-devel > 2.1
@@ -52,7 +56,7 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{rele
 Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
 %endif
 
-%if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
+%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
 %if "%{php_version}" > "7.1"
 Obsoletes:     php71u-pecl-%{pecl_name} <= %{version}
@@ -99,6 +103,10 @@ sed -e 's/role="test"/role="src"/' \
 
 cd NTS
 %patch0 -p1 -b .pr38
+%patch1 -p1 -b .pr42
+cd phpc
+%patch10 -p1 -b .pr1
+cd ..
 
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_FANN_VERSION/{s/.* "//;s/".*$//;p}' php_fann.h)
@@ -230,6 +238,11 @@ fi
 
 
 %changelog
+* Tue Aug 25 2020 Remi Collet <remi@remirepo.net> - 1.1.1-17
+- add patches for PHP8 from
+  https://github.com/bukka/php-fann/pull/42
+  https://github.com/bukka/phpc/pull/1
+
 * Tue Sep 03 2019 Remi Collet <remi@remirepo.net> - 1.1.1-14
 - rebuild for 7.4.0RC1
 
-- 
cgit