update to 1.2.0RC2

drop patches merged upstream

4 files changed, 15 insertions, 78 deletions

diff --git a/PHPINFO b/PHPINFO
index 844ea70..0a183e6 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,5 +2,5 @@
 fann
 
 FANN support => enabled
-FANN version => 1.2.0RC1
+FANN version => 1.2.0RC2
 FANN library version => 2.2
diff --git a/REFLECTION b/REFLECTION
index 4d58f54..dfff847 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #119 fann version 1.2.0RC1 ] {
+Extension [ <persistent> extension #119 fann version 1.2.0RC2 ] {
 
   - Constants [51] {
     Constant [ string FANN_VERSION ] { 2.2 }
@@ -61,7 +61,7 @@ Extension [ <persistent> extension #119 fann version 1.2.0RC1 ] {
         Parameter #0 [ <required> $num_layers ]
         Parameter #1 [ <required> $num_neurons1 ]
         Parameter #2 [ <required> $num_neurons2 ]
-        Parameter #3 [ <optional> $... ]
+        Parameter #3 [ <optional> $... = <default> ]
       }
     }
     Function [ <internal:fann> function fann_create_standard_array ] {
@@ -78,7 +78,7 @@ Extension [ <persistent> extension #119 fann version 1.2.0RC1 ] {
         Parameter #1 [ <required> $num_layers ]
         Parameter #2 [ <required> $num_neurons1 ]
         Parameter #3 [ <required> $num_neurons2 ]
-        Parameter #4 [ <optional> $... ]
+        Parameter #4 [ <optional> $... = <default> ]
       }
     }
     Function [ <internal:fann> function fann_create_sparse_array ] {
@@ -95,7 +95,7 @@ Extension [ <persistent> extension #119 fann version 1.2.0RC1 ] {
         Parameter #0 [ <required> $num_layers ]
         Parameter #1 [ <required> $num_neurons1 ]
         Parameter #2 [ <required> $num_neurons2 ]
-        Parameter #3 [ <optional> $... ]
+        Parameter #3 [ <optional> $... = <default> ]
       }
     }
     Function [ <internal:fann> function fann_create_shortcut_array ] {
@@ -1043,9 +1043,9 @@ Extension [ <persistent> extension #119 fann version 1.2.0RC1 ] {
       }
 
       - Properties [3] {
-        Property [ <default> public $from_neuron ]
-        Property [ <default> public $to_neuron ]
-        Property [ <default> public $weight ]
+        Property [ public $from_neuron = 0 ]
+        Property [ public $to_neuron = 0 ]
+        Property [ public $weight = 0 ]
       }
 
       - Methods [5] {
diff --git a/fann-php81.patch b/fann-php81.patch
deleted file mode 100644
index 735289d..0000000
--- a/fann-php81.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a4b927a0f9e7dce9d0b002e559c314b45acf46ff Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 10 Jun 2021 16:17:26 +0200
-Subject: [PATCH] add PHPC_PHP_STAT helper
-
----
- phpc.h | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/phpc.h b/phpc.h
-index 9206105..8e7211f 100644
---- a/phpc/phpc.h
-+++ b/phpc/phpc.h
-@@ -1595,5 +1595,16 @@ typedef const char phpc_stream_opener_char_t;
- 	php_stream_locate_url_wrapper(_path, (char **) _path_for_open, _options TSRMLS_CC)
- #endif
- 
-+#if (PHP_MAJOR_VERSION == 8 && PHP_MINOR_VERSION >= 1) || (PHP_MAJOR_VERSION > 8)
-+#define PHPC_PHP_STAT(filename, filename_length, type, return_value) do { \
-+		zend_string *str = zend_string_init(filename, filename_length, 0); \
-+		php_stat(str, type, return_value); \
-+		zend_string_release(str); \
-+	} while (0)
-+
-+#else
-+#define PHPC_PHP_STAT php_stat
-+#endif
-+
- #endif	/* PHPC_H */
- 
-From 79111c0b9504d18f4c9b70c2a6b6ed9eadc5047d Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Thu, 10 Jun 2021 16:18:23 +0200
-Subject: [PATCH] Use PHPC_PHP_STAT helper
-
----
- fann.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/fann.c b/fann.c
-index 68dd96b..d0c0d84 100644
---- a/fann.c
-+++ b/fann.c
-@@ -1189,13 +1189,13 @@ static char *php_fann_get_path_for_open(char *path, phpc_str_size_t path_len, in
- 	char *path_for_open;
- 
- 	if (read) {
--		php_stat(path, (php_stat_len) path_len, FS_IS_R, &retval TSRMLS_CC);
-+		PHPC_PHP_STAT(path, (php_stat_len) path_len, FS_IS_R, &retval TSRMLS_CC);
- 	} else {
--		php_stat(path, (php_stat_len) path_len, FS_IS_W, &retval TSRMLS_CC);
-+		PHPC_PHP_STAT(path, (php_stat_len) path_len, FS_IS_W, &retval TSRMLS_CC);
- 		if (PHP_FANN_PATH_FORBIDDEN(retval)) {
- 			char *dirname = estrndup(path, path_len);
- 			size_t dirname_len = php_dirname(dirname, (size_t) path_len);
--			php_stat(dirname, (php_stat_len) dirname_len, FS_IS_W, &retval TSRMLS_CC);
-+			PHPC_PHP_STAT(dirname, (php_stat_len) dirname_len, FS_IS_W, &retval TSRMLS_CC);
- 			efree(dirname);
- 		}
- 	}
diff --git a/php-pecl-fann.spec b/php-pecl-fann.spec
index 41047d6..65d92af 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-2021 Remi Collet
+# Copyright (c) 2013-2022 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -24,18 +24,16 @@
 %endif
 
 %global upstream_version 1.2.0
-%global upstream_prever  RC1
+%global upstream_prever  RC2
 
 Summary:        Wrapper for FANN Library
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        1%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 
-Patch0:         %{pecl_name}-php81.patch
-
 BuildRequires:  make
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  fann-devel > 2.1
@@ -57,9 +55,6 @@ Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{rele
 
 %if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel}
 # Other third party repo stuff
-%if "%{php_version}" > "7.3"
-Obsoletes:      php73-pecl-%{pecl_name} <= %{version}
-%endif
 %if "%{php_version}" > "7.4"
 Obsoletes:      php74-pecl-%{pecl_name} <= %{version}
 %endif
@@ -91,8 +86,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_FANN_VERSION/{s/.* "//;s/".*$//;p}' php_fann.h)
 if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
@@ -223,6 +216,10 @@ fi
 
 
 %changelog
+* Mon Jan  3 2022 Remi Collet <remi@remirepo.net> - 1.2.0~RC2-1
+- update to 1.2.0RC2
+- drop patches merged upstream
+
 * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 1.2.0~RC1-3
 - rebuild for 8.1.0RC1