update to 3.1.4

4 files changed, 17 insertions, 59 deletions

diff --git a/0001-declare-mimemessage-data-property-for-8.2.patch b/0001-declare-mimemessage-data-property-for-8.2.patch
deleted file mode 100644
index 489a7a7..0000000
--- a/0001-declare-mimemessage-data-property-for-8.2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From e633e2308afe992a2eaf2bbf3f0ab34fc420ce77 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Tue, 24 May 2022 16:16:44 +0200
-Subject: [PATCH] declare mimemessage::data property (for 8.2)
-
----
- mailparse.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mailparse.c b/mailparse.c
-index 58c8b7b..631a225 100644
---- a/mailparse.c
-+++ b/mailparse.c
-@@ -160,6 +160,7 @@ PHP_MINIT_FUNCTION(mailparse)
- 	INIT_CLASS_ENTRY(mmce, "mimemessage", mimemessage_methods);
- 	mimemsg_class_entry = zend_register_internal_class(&mmce);
- 
-+	zend_declare_property_null(mimemsg_class_entry, "data", sizeof("data")-1, ZEND_ACC_PUBLIC);
- 
- 	le_mime_part = zend_register_list_destructors_ex(mimepart_dtor, NULL, mailparse_msg_name, module_number);
- 
--- 
-2.35.3
-
diff --git a/PHPINFO b/PHPINFO
index 36079f7..fd53c88 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,7 +2,7 @@
 mailparse
 
 mailparse support => enabled
-Extension Version => 3.1.3
+Extension Version => 3.1.4
 
 Directive => Local Value => Master Value
 mailparse.def_charset => us-ascii => us-ascii
diff --git a/REFLECTION b/REFLECTION
index 32315e3..2e37bd0 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #83 mailparse version 3.1.3 ] {
+Extension [ <persistent> extension #84 mailparse version 3.1.4 ] {
 
   - Dependencies {
     Dependency [ mbstring (Required) ]
diff --git a/php-pecl-mailparse.spec b/php-pecl-mailparse.spec
index 1f3d0f5..9cb3b1b 100644
--- a/php-pecl-mailparse.spec
+++ b/php-pecl-mailparse.spec
@@ -15,28 +15,25 @@
 # we don't want -z defs linker flag
 %undefine _strict_symbol_defs_build
 
-%if 0%{?scl:1}
-%global sub_prefix %{scl_prefix}
-%scl_package       php-pecl-mailparse
-%endif
+%{?scl:%scl_package php-pecl-mailparse}
+
+%bcond_without    tests
 
 %global pecl_name mailparse
 %global with_zts  0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name  40-%{pecl_name}.ini
 
 Summary:   PHP PECL package for parsing and working with email messages
-Name:      %{?sub_prefix}php-pecl-mailparse
-Version:   3.1.3
-Release:   2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Name:      %{?scl_prefix}php-pecl-mailparse
+Version:   3.1.4
+Release:   1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:   PHP
 URL:       https://pecl.php.net/package/mailparse
 Source0:   https://pecl.php.net/get/%{pecl_name}-%{version}.tgz
 
-Patch0:    0001-declare-mimemessage-data-property-for-8.2.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel >= 7.0
+BuildRequires: %{?scl_prefix}php-devel >= 7.3
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: %{?scl_prefix}php-mbstring
 # Required by phpize
@@ -54,26 +51,6 @@ Provides:       %{?scl_prefix}php-%{pecl_name}               = %{version}
 Provides:       %{?scl_prefix}php-%{pecl_name}%{?_isa}       = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})         = %{version}
 Provides:       %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
-%if "%{?scl_prefix}" != "%{?sub_prefix}"
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}          = %{version}-%{release}
-Provides:       %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa}  = %{version}-%{release}
-%endif
-
-%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
-%if "%{php_version}" > "8.0"
-Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
-%endif
-%if "%{php_version}" > "8.1"
-Obsoletes:      php81-pecl-%{pecl_name} <= %{version}
-%endif
-%endif
 
 
 %description
@@ -94,8 +71,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
-%patch0 -p1
-
 extver=$(sed -n '/#define PHP_MAILPARSE_VERSION/{s/.* "//;s/".*$//;p}' php_mailparse.h)
 if test "x${extver}" != "x%{version}"; then
    : Error: Upstream version is ${extver}, expecting %{version}.
@@ -161,6 +136,7 @@ done
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
+%if %{with tests}
 : Upstream test suite for NTS extension
 cd NTS
 TEST_PHP_EXECUTABLE=%{__php} \
@@ -168,6 +144,7 @@ TEST_PHP_EXECUTABLE=%{__php} \
     -d extension=mbstring.so \
     -d extension=$PWD/modules/%{pecl_name}.so \
     --show-diff
+%endif
 
 %if %{with_zts}
 : Minimal load test for ZTS extension
@@ -176,6 +153,7 @@ TEST_PHP_EXECUTABLE=%{__php} \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
+%if %{with tests}
 : Upstream test suite for ZTS extension
 cd ../ZTS
 TEST_PHP_EXECUTABLE=%{__ztsphp} \
@@ -184,6 +162,7 @@ php run-tests.php -n -q \
     -d extension=$PWD/modules/%{pecl_name}.so \
     --show-diff
 %endif
+%endif
 
 
 %if 0%{?fedora} < 24 && 0%{?rhel} < 8
@@ -221,7 +200,10 @@ fi
 
 
 %changelog
-* Mon May 24 2022 Remi Collet <remi@remirepo.net> - 3.1.3-2
+* Thu Sep 15 2022 Remi Collet <remi@remirepo.net> - 3.1.4-1
+- update to 3.1.4
+
+* Tue May 24 2022 Remi Collet <remi@remirepo.net> - 3.1.3-2
 - add upstream patch for PHP 8.2
 
 * Mon Feb 21 2022 Remi Collet <remi@remirepo.net> - 3.1.3-1