update to 3.2.0HEADmaster

drop dependency on mbstring

1 files changed, 21 insertions, 28 deletions

diff --git a/php-pecl-mailparse.spec b/php-pecl-mailparse.spec
index 97c0bb1..ad73721 100644
--- a/php-pecl-mailparse.spec
+++ b/php-pecl-mailparse.spec
@@ -14,29 +14,28 @@
 
 %{?scl:%scl_package php-pecl-mailparse}
 
-%bcond_without     tests
+%bcond_without      tests
 
-%global pie_vend    pecl
-%global pie_proj    mailparse
 %global pecl_name   mailparse
+%global pie_vend    pecl
+%global pie_proj    %{pecl_name}
 %global with_zts    0%{!?_without_zts:%{?__ztsphp:1}}
 %global ini_name    40-%{pecl_name}.ini
-%global sources     %{archivename}
-%global _configure  ../%{sources}/configure
+%global _configure  ../configure
 
 # Github forge
 %global gh_vend     php
-%global gh_proj     pecl-mail-mailparse
+%global gh_proj     pecl-mail-%{pecl_name}
 %global forgeurl    https://github.com/%{gh_vend}/%{gh_proj}
 %global tag         v%{version}
 # for EL-8 to avoid TAG usage
 %global archivename %{gh_proj}-%{version}
 
-Name:      %{?scl_prefix}php-pecl-mailparse
+Name:      %{?scl_prefix}php-pecl-%{pecl_name}
 Summary:   PHP PECL package for parsing and working with email messages
 License:   PHP-3.01
-Version:   3.1.9
-Release:   2%{?dist}
+Version:   3.2.0
+Release:   1%{?dist}
 %forgemeta
 URL:       %{forgeurl}
 Source0:   %{forgesource}
@@ -44,14 +43,12 @@ Source0:   %{forgesource}
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.3
-BuildRequires: %{?scl_prefix}php-mbstring
 # Required by phpize
 BuildRequires: autoconf, automake, libtool
 #BuildRequires: gdb
 #BuildRequires: php-debuginfo
 #BuildRequires: php-debugsource
 
-Requires: %{?scl_prefix}php-mbstring%{?_isa}
 Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api}
 Requires: %{?scl_prefix}php(api) = %{php_core_api}
 
@@ -73,9 +70,8 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
 
 
 %prep
-%setup -q -c
+%forgesetup
 
-cd %{sources}
 # avoid re2c
 touch php_mailparse_rfc822.c
 
@@ -84,11 +80,10 @@ if test "x${extver}" != "x%{version}"; then
    : Error: Upstream version is ${extver}, expecting %{version}.
    exit 1
 fi
-cd ..
 
 cat > %{ini_name} << 'EOF'
-; Enable mailparse extension module
-extension = mailparse.so
+; Enable %{pecl_name} extension module
+extension = %{pecl_name}.so
 
 ; Set the default charset
 ;mailparse.def_charset = us-ascii
@@ -103,12 +98,11 @@ mkdir ZTS
 %build
 %{?dtsenable}
 
-cd %{sources}
 %{__phpize}
 [ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
 sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
 
-cd ../NTS
+cd NTS
 %configure --with-php-config=%{__phpconfig}
 %make_build
 
@@ -134,11 +128,8 @@ install -Dpm 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
 
 
 %check
-cd %{sources}
-
 : Minimal load test for NTS extension
 %{__php} --no-php-ini \
-    --define extension=mbstring.so \
     --define extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 
@@ -146,7 +137,6 @@ cd %{sources}
 : Upstream test suite for NTS extension
 TEST_PHP_EXECUTABLE=%{__php} \
 %{__php} -n run-tests.php -n -q \
-    -d extension=mbstring.so \
     -d extension=%{buildroot}%{php_extdir}/%{pecl_name}.so \
     --show-diff
 %endif
@@ -154,18 +144,17 @@ TEST_PHP_EXECUTABLE=%{__php} \
 %if %{with_zts}
 : Minimal load test for ZTS extension
 %{__ztsphp} --no-php-ini \
-    --define extension=mbstring.so \
     --define extension=%{buildroot}%{php_ztsextdir}/%{pecl_name}.so \
     --modules | grep '^%{pecl_name}$'
 %endif
 
 
 %files
-%license %{sources}/LICENSE
-%doc %{sources}/composer.json
-%doc %{sources}/CREDITS
-%doc %{sources}/*.md
-%doc %{sources}/try.php
+%license LICENSE
+%doc composer.json
+%doc CREDITS
+%doc *.md
+%doc try.php
 
 %config(noreplace) %{php_inidir}/%{ini_name}
 %{php_extdir}/%{pecl_name}.so
@@ -177,6 +166,10 @@ TEST_PHP_EXECUTABLE=%{__php} \
 
 
 %changelog
+* Thu Apr  9 2026 Remi Collet <remi@remirepo.net> - 3.2.0-1
+- update to 3.2.0
+- drop dependency on mbstring
+
 * Tue Mar 17 2026 Remi Collet <remi@remirepo.net> - 3.1.9-2
 - drop pear/pecl dependency
 - sources from github