Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package php7 for openSUSE:Factory checked in
at 2021-12-06 23:59:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/php7 (Old)
and /work/SRC/openSUSE:Factory/.php7.new.31177 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php7"
Mon Dec 6 23:59:07 2021 rev:107 rq:935379 version:7.4.26
Changes:
--------
--- /work/SRC/openSUSE:Factory/php7/php7.changes 2021-11-20
22:48:13.323824092 +0100
+++ /work/SRC/openSUSE:Factory/.php7.new.31177/php7.changes 2021-12-06
23:59:15.492590714 +0100
@@ -1,0 +2,6 @@
+Wed Dec 1 21:44:34 UTC 2021 - Arjen de Korte <suse+bu...@de-korte.org>
+
+- provide configuration for PHP-FPM out of the box (boo#1192414)
+- package missing php.ini for PHP-FPM (boo#1192672)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ php7.spec ++++++
--- /var/tmp/diff_new_pack.KMGeFN/_old 2021-12-06 23:59:16.248588040 +0100
+++ /var/tmp/diff_new_pack.KMGeFN/_new 2021-12-06 23:59:16.252588026 +0100
@@ -1246,12 +1246,16 @@
%if "%{flavor}" == "fpm"
make install-binaries INSTALL_ROOT=%{buildroot}
install -dm 755 %{buildroot}%{php_sysconf}/fpm
+sed "s=@extdir@=%{extension_dir}=" php.ini-production >
%{buildroot}%{php_sysconf}/fpm/php.ini
#install fpm init script.
install -D -m 0644 sapi/fpm/php-fpm.service
%{buildroot}%{_unitdir}/php-fpm.service
ln -s service %{buildroot}%{_sbindir}/rcphp-fpm
# bug 1173786
install -d -m 0755 %{buildroot}%{_tmpfilesdir}
install -m 0644 %{SOURCE12} %{buildroot}%{_tmpfilesdir}/php-fpm.conf
+# bug 1192414
+mv %{buildroot}%{php_sysconf}/fpm/php-fpm.conf{.default,}
+mv %{buildroot}%{php_sysconf}/fpm/php-fpm.d/www.conf{.default,}
%endif
%if "%{flavor}" == ""
@@ -1336,7 +1340,7 @@
%if 0%{?suse_version} > 1500
%service_del_postun_without_restart php-fpm.service
%else
-%service_del_postun -n php-fpm.service
+%service_del_postun php-fpm.service
%endif
%posttrans
@@ -1406,8 +1410,9 @@
%{_sbindir}/php-fpm
%dir %{php_sysconf}/fpm
%dir %{php_sysconf}/fpm/php-fpm.d
-%config %{php_sysconf}/fpm/php-fpm.conf.default
-%config %{php_sysconf}/fpm/php-fpm.d/www.conf.default
+%config(noreplace) %{php_sysconf}/fpm/php.ini
+%config(noreplace) %{php_sysconf}/fpm/php-fpm.conf
+%config(noreplace) %{php_sysconf}/fpm/php-fpm.d/www.conf
%{_mandir}/man8/php-fpm.8%{?ext_man}
%{_sbindir}/rcphp-fpm
%dir %{_datadir}/%{php_name}/fpm
