summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2025-07-09 12:35:30 +0200
committerRemi Collet <remi@php.net>2025-07-09 12:35:30 +0200
commit8748ef64423aab97bb1c8f59d542104f1576fdfa (patch)
treefa20020140d98c137d0ee5e061ea8a03ff404fca
parent8d71fc18dc2920951dbce6c9109db24f9f0e60e1 (diff)
rename temp files in test suite to improve parallelismHEADmaster
-rw-r--r--php-pecl-gmagick.spec39
1 files changed, 12 insertions, 27 deletions
diff --git a/php-pecl-gmagick.spec b/php-pecl-gmagick.spec
index b31d578..1a06a05 100644
--- a/php-pecl-gmagick.spec
+++ b/php-pecl-gmagick.spec
@@ -1,6 +1,6 @@
# spec file for php-pecl-gmagick
#
-# Copyright (c) 2010-2024 Remi Collet
+# Copyright (c) 2010-2025 Remi Collet
# Copyright (c) 2009-2010 Pavel Alexeev
# License: MIT
# http://opensource.org/licenses/MIT
@@ -26,7 +26,7 @@
Summary: Provides a wrapper to the GraphicsMagick library
Name: %{?scl_prefix}php-pecl-%{pecl_name}
Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release: 12%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release: 13%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
License: PHP-3.01
URL: https://pecl.php.net/package/%{pecl_name}
Source0: https://pecl.php.net/get/%{sources}.tgz
@@ -64,19 +64,21 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO
# Don't install/register tests
sed -e 's/role="test"/role="src"/' \
- %{?_licensedir:-e '/LICENSE/s/role="doc"/role="src"/' } \
+ -e '/LICENSE/s/role="doc"/role="src"/' \
-i package.xml
-cd %{sources}
+pushd %{sources}
%patch -P0 -p1
%patch -P1 -p1
-
+pushd tests
+for i in $(grep -l test_constructor *phpt); do sed -e "s:test_constructor:${i/.phpt/}:" -i $i; done
+popd
extver=$(sed -n '/#define PHP_GMAGICK_VERSION/{s/.* "//;s/".*$//;p}' php_gmagick.h)
if test "x${extver}" != "x%{upstream_version}%{?upstream_prever}"; then
: Error: Upstream extension version is ${extver}, expecting %{upstream_version}%{?upstream_prever}.
exit 1
fi
-cd ..
+popd
# Create configuration file
cat >%{ini_name} << 'EOF'
@@ -129,26 +131,6 @@ do install -Dpm 644 %{sources}/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i
done
-%if 0%{?fedora} < 24 && 0%{?rhel} < 8
-# when pear installed alone, after us
-%triggerin -- %{?scl_prefix}php-pear
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-# posttrans as pear can be installed after us
-%posttrans
-if [ -x %{__pecl} ] ; then
- %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || :
-fi
-
-%postun
-if [ $1 -eq 0 -a -x %{__pecl} ] ; then
- %{pecl_uninstall} %{pecl_name} >/dev/null || :
-fi
-%endif
-
-
%check
cd %{sources}
# Workaround for old libgomp, ensure single thread is used
@@ -192,7 +174,7 @@ export TEST_PHP_ARGS="-n -d extension=$PWD/../ZTS/modules/%{pecl_name}.so"
%files
-%{?_licensedir:%license %{sources}/LICENSE}
+%license %{sources}/LICENSE
%doc %{pecl_docdir}/%{pecl_name}
%{pecl_xmldir}/%{name}.xml
@@ -206,6 +188,9 @@ export TEST_PHP_ARGS="-n -d extension=$PWD/../ZTS/modules/%{pecl_name}.so"
%changelog
+* Wed Jul 9 2025 Remi Collet <remi@remirepo.net> - 2.0.6~RC1-13
+- rename temp files in test suite to improve parallelism
+
* Tue Jan 30 2024 Remi Collet <remi@remirepo.net> - 2.0.6~RC1-12
- fix incompatible pointer types using patch from
https://github.com/vitoc/gmagick/pull/59