Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2017-03-21 22:46:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5" Tue Mar 21 22:46:16 2017 rev:164 rq:480892 version:5.6.30 Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2017-02-06 14:34:22.620511135 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2017-03-21 22:46:18.374290110 +0100 @@ -1,0 +2,5 @@ +Fri Mar 17 16:34:17 UTC 2017 - [email protected] + +- Don't install the init script if we use systemd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.mnDEtN/_old 2017-03-21 22:46:20.374007401 +0100 +++ /var/tmp/diff_new_pack.mnDEtN/_new 2017-03-21 22:46:20.378006836 +0100 @@ -1,7 +1,7 @@ # # spec file for package php5 # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -235,8 +235,8 @@ %package devel Summary: Include files of PHP5 -# this is required by the installed development headers Group: Development/Languages/C and C++ +# this is required by the installed development headers Requires: %{name} = %{version} Requires: glibc-devel Requires: libxml2-devel @@ -359,7 +359,6 @@ Summary: FastCGI Process Manager PHP5 Module Group: Development/Libraries/PHP Requires: %{name} = %{version} -PreReq: %insserv_prereq Provides: mod_php_any = %{version} Provides: php-date = %{version} Provides: php-filter = %{version} @@ -374,6 +373,8 @@ %if %{with systemd} %{systemd_requires} BuildRequires: pkgconfig(libsystemd) +%else +Requires(pre): %insserv_prereq %endif %description fpm @@ -1440,8 +1441,6 @@ $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.php #install fpm init script. -install -d %{buildroot}%{_sysconfdir}/init.d -install -m 755 -c %{S:7} %{buildroot}%{_sysconfdir}/init.d/php-fpm %if %{with systemd} install -D -m 0644 ./build-fpm/sapi/fpm/php-fpm.service %{buildroot}%{_unitdir}/php-fpm.service %if 0%{suse_version} > 1220 @@ -1450,6 +1449,8 @@ ln -s /sbin/service %{buildroot}%{_sbindir}/rcphp-fpm %endif %else +install -d %{buildroot}%{_sysconfdir}/init.d +install -m 755 -c %{S:7} %{buildroot}%{_sysconfdir}/init.d/php-fpm ln -s %{_sysconfdir}/init.d/php-fpm %{buildroot}%{_sbindir}/rcphp-fpm %endif # pear installer installs .depdb{,lock} files into %{buildroot}%{peardir} @@ -1483,16 +1484,12 @@ %postun fpm %service_del_postun php-fpm.service -%restart_on_update php-fpm -%insserv_cleanup %preun fpm %service_del_preun php-fpm.service -%stop_on_removal php-fpm %post fpm %service_add_post php-fpm.service -%{fillup_and_insserv -f php-fpm} %else %postun fpm %restart_on_update php-fpm @@ -1570,12 +1567,13 @@ %dir %{php_sysconf}/fpm %config %{php_sysconf}/fpm/php-fpm.conf.default %{_mandir}/man8/php-fpm.8.gz -%config /etc/init.d/php-fpm %{_sbindir}/rcphp-fpm %dir %{_datadir}/%{pkg_name}/fpm %{_datadir}/%{pkg_name}/fpm/status.html %if %{with systemd} %{_unitdir}/php-fpm.service +%else +%config /etc/init.d/php-fpm %endif %files -n apache2-mod_php5
