From dd883de5a7aab0e588be2681822734f4a3587bd1 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 5 Oct 2021 07:06:46 +0200
Subject: update to 1.0.3

drop patch merged upstream
---
 .gitignore         |  2 ++
 PHPINFO            |  9 ++++++++-
 REFLECTION         |  2 +-
 apfd-php81.patch   | 38 --------------------------------------
 php-pecl-apfd.spec | 12 ++++++------
 5 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 apfd-php81.patch

diff --git a/.gitignore b/.gitignore
index 1ab5c4f..01f0400 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,7 @@
+clog
 package-*.xml
 *.tgz
+*.tar.bz2
 *.tar.gz
 *.tar.xz
 *.tar.xz.asc
diff --git a/PHPINFO b/PHPINFO
index 6386963..3abe209 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -1,4 +1,11 @@
 
 apfd
 
-apfd support => enabled
+APFD Support => enabled
+Extension Version => 1.0.3
+
+Content type => Reader => Handler
+multipart/form-data => default => custom
+application/x-www-form-urlencoded => default => default
+text/json => default => custom
+application/json => default => custom
diff --git a/REFLECTION b/REFLECTION
index e505cda..6054c9e 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,3 +1,3 @@
-Extension [ <persistent> extension #119 apfd version 1.0.2 ] {
+Extension [ <persistent> extension #125 apfd version 1.0.3 ] {
 }
 
diff --git a/apfd-php81.patch b/apfd-php81.patch
deleted file mode 100644
index 9b897d4..0000000
--- a/apfd-php81.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3b75b75ca2c8fde273b244052bb60f9cb4a56072 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 9 Jun 2021 11:46:36 +0200
-Subject: [PATCH] ignore new "full_path" member in 8.1
-
----
- tests/002.phpt | 3 +++
- tests/003.phpt | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/tests/002.phpt b/tests/002.phpt
-index e46df77..50ca235 100644
---- a/tests/002.phpt
-+++ b/tests/002.phpt
-@@ -70,6 +70,9 @@ mike
- --FILE--
- <?php
- 
-+foreach($_FILES as $i => $v) {
-+	unset($_FILES[$i]['full_path']); // only in 8.1
-+}
- var_dump($_POST, $_FILES);
- 
- ?>
-diff --git a/tests/003.phpt b/tests/003.phpt
-index 7cfd9ca..94b8989 100644
---- a/tests/003.phpt
-+++ b/tests/003.phpt
-@@ -70,6 +70,9 @@ mike
- --FILE--
- <?php
- 
-+foreach($_FILES as $i => $v) {
-+	unset($_FILES[$i]['full_path']); // only in 8.1
-+}
- var_dump($_POST, $_FILES);
- 
- ?>
diff --git a/php-pecl-apfd.spec b/php-pecl-apfd.spec
index 2a7c354..977d17c 100644
--- a/php-pecl-apfd.spec
+++ b/php-pecl-apfd.spec
@@ -30,14 +30,12 @@
 
 Summary:        Always Populate Form Data
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
-Version:        1.0.2
-Release:        5%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:        1.0.3
+Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:        BSD
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
-Patch0:         %{pecl_name}-php81.patch
-
 BuildRequires:  %{?dtsprefix}gcc
 BuildRequires:  make
 BuildRequires:  %{?scl_prefix}php-devel
@@ -88,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_APFD_VERSION/{s/.* "//;s/".*$//;p}' php_apfd.h)
 if test "x${extver}" != "x%{version}%{?prever}"; then
@@ -217,6 +213,10 @@ cd ../ZTS
 
 
 %changelog
+* Tue Oct  5 2021 Remi Collet <remi@remirepo.net> - 1.0.3-1
+- update to 1.0.3
+- drop patch merged upstream
+
 * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 1.0.2-5
 - rebuild for 8.1.0RC1
 
-- 
cgit