Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7-gmagick for openSUSE:Factory
checked in at 2021-01-25 18:23:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7-gmagick (Old)
and /work/SRC/openSUSE:Factory/.php7-gmagick.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7-gmagick"
Mon Jan 25 18:23:25 2021 rev:9 rq:866100 version:2.0.5RC1
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7-gmagick/php7-gmagick.changes
2020-01-04 19:22:05.749157297 +0100
+++ /work/SRC/openSUSE:Factory/.php7-gmagick.new.28504/php7-gmagick.changes
2021-01-25 18:23:43.508437777 +0100
@@ -1,0 +2,13 @@
+Fri Jan 22 12:27:13 UTC 2021 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- Expect test to fail with GraphicsMagick-1.3.36 (due to API change)
+ + ignore-test-GraphicsMagick-1.3.36.patch
+
+-------------------------------------------------------------------
+Sun Jan 17 10:36:07 UTC 2021 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- Use php_cfgdir and php_extdir macros to determine location of files
+- Generate .ini file from spec
+ - delete imagick.ini
+
+-------------------------------------------------------------------
Old:
----
gmagick.ini
New:
----
ignore-test-GraphicsMagick-1.3.36.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7-gmagick.spec ++++++
--- /var/tmp/diff_new_pack.5UWQWA/_old 2021-01-25 18:23:45.596440812 +0100
+++ /var/tmp/diff_new_pack.5UWQWA/_new 2021-01-25 18:23:45.600440818 +0100
@@ -1,7 +1,7 @@
#
# spec file for package php7-gmagick
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,6 +18,9 @@
%define php_name php7
%define pkg_name gmagick
+%define php_extdir %(%{__php_config} --extension-dir)
+%define php_cfgdir %{_sysconfdir}/%{php_name}/conf.d
+
Name: %{php_name}-%{pkg_name}
Version: 2.0.5RC1
Release: 0
@@ -26,22 +29,18 @@
Group: Productivity/Networking/Web/Servers
URL: https://pecl.php.net/package/gmagick
Source0: https://pecl.php.net/get/%{pkg_name}-%{version}.tgz
-Source1: %{pkg_name}.ini
# PATCH-FIX-UPSTREAM fix-segfault-on-shutdown.patch
https://bugs.php.net/bug.php?id=78465
Patch0: fix-segfault-on-shutdown.patch
+Patch1: ignore-test-GraphicsMagick-1.3.36.patch
BuildRequires: %{php_name}-devel
BuildRequires: GraphicsMagick-devel
BuildRequires: ghostscript-fonts-std
BuildRequires: re2c
-Conflicts: php7-imagick
+Conflicts: %{php_name}-imagick
Provides: php-%{pkg_name} = %{version}
Obsoletes: php-%{pkg_name} < %{version}
-%if %{?php_zend_api}0
Requires: php(api) = %{php_core_api}
Requires: php(zend-abi) = %{php_zend_api}
-%else
-%requires_eq %{php_name}
-%endif
%description
PHP extension to create, modify and obtain meta information of images using
@@ -50,10 +49,13 @@
%prep
%setup -q -n %{pkg_name}-%{version}
%patch0
+%if 0%{?suse_version} > 1500
+%patch1
+%endif
%build
export CFLAGS="%{optflags} -fvisibility=hidden %(GraphicsMagick-config
--cflags)"
-%{_bindir}/phpize
+%{__phpize}
%configure
%make_build
@@ -62,13 +64,16 @@
%install
%make_install INSTALL_ROOT=%{buildroot}
-mkdir -p %{buildroot}%{_sysconfdir}/%{php_name}/conf.d
-install -m644 %{SOURCE1}
%{buildroot}%{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
+mkdir -p %{buildroot}%{php_cfgdir}
+cat > %{buildroot}%{php_cfgdir}/%{pkg_name}.ini <<EOF
+; comment out next line to disable %{pkg_name} extension in php
+extension = %{pkg_name}.so
+EOF
%files
-%config(noreplace) %{_sysconfdir}/%{php_name}/conf.d/%{pkg_name}.ini
%license LICENSE
%doc CONTRIBUTORS.md README.md
-%{_libdir}/%{php_name}/extensions/%{pkg_name}.so
+%config(noreplace) %{php_cfgdir}/%{pkg_name}.ini
+%{php_extdir}/%{pkg_name}.so
%changelog
++++++ ignore-test-GraphicsMagick-1.3.36.patch ++++++
--- tests/gmagick-056-set_getsamplingfactors.phpt 2018-01-01
03:37:18.000000000 +0100
+++ tests/gmagick-056-set_getsamplingfactors.phpt 2021-01-22
13:22:13.171846979 +0100
@@ -1,5 +1,7 @@
--TEST--
Set, getsamplingfactors
+--XFAIL--
+https://sourceforge.net/p/graphicsmagick/bugs/633/
--SKIPIF--
<?php
/* $Id: gmagick-056-set_getsamplingfactors.phpt 280206 2009-05-09 18:22:48Z
vito $ */
@@ -17,4 +19,4 @@ Array
(
[0] => 1
[1] => 2
-)
\ Geen regeleindeteken (LF) aan einde van bestand
+)
