From b7235a0df713c2d6d03f7ae3d7c6da6e89798d97 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 6 Sep 2021 09:23:19 +0200
Subject: rebuild with workaround for
 https://github.com/libvips/php-vips-ext/issues/43

---
 php-pecl-vips.spec | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'php-pecl-vips.spec')

diff --git a/php-pecl-vips.spec b/php-pecl-vips.spec
index 70a3d02..47f5d30 100644
--- a/php-pecl-vips.spec
+++ b/php-pecl-vips.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-pecl-vips
 #
-# Copyright (c) 2016-2020 Remi Collet
+# Copyright (c) 2016-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -22,13 +22,14 @@
 Summary:        PHP extension for interfacing with libvips
 Name:           %{?sub_prefix}php-pecl-%{pecl_name}
 Version:        1.0.12
-Release:        3%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
+Release:        4%{?dist}%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}
 License:        PHP
 Group:          Development/Languages
 URL:            https://pecl.php.net/package/%{pecl_name}
 Source0:        https://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 
 BuildRequires:  %{?dtsprefix}gcc
+BuildRequires:  make
 BuildRequires:  %{?scl_prefix}php-devel > 7
 BuildRequires:  %{?scl_prefix}php-pear
 # ensure latest version is used (upstream requires 8.2)
@@ -64,12 +65,6 @@ Obsoletes:      php80-pecl-%{pecl_name} <= %{version}
 %endif
 %endif
 
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter private shared object
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 This extension uses libvips to provide image processing facilities.
@@ -110,6 +105,8 @@ EOF
 %build
 %{?dtsenable}
 
+export LDFLAGS="%{?__global_ldflags} -Wl,-z,nodelete"
+
 cd NTS
 %{_bindir}/phpize
 %configure \
@@ -179,6 +176,9 @@ fi
 # Need investigation
 rm ?TS/tests/029.phpt
 
+# Workaround for https://github.com/libvips/php-vips-ext/issues/43
+export ZEND_DONT_UNLOAD_MODULES=1
+
 : Minimal load test for NTS extension
 cd NTS
 %{_bindir}/php --no-php-ini \
@@ -225,6 +225,9 @@ REPORT_EXIT_STATUS=1 \
 
 
 %changelog
+* Mon Sep  6 2021 Remi Collet <remi@remirepo.net> - 1.0.12-4
+- rebuild with workaround for https://github.com/libvips/php-vips-ext/issues/43
+
 * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.0.12-3
 - rebuild for PHP 8.0.0RC1
 
-- 
cgit