Hello community, here is the log from the commit of package php5 for openSUSE:Factory checked in at 2014-02-26 23:20:29 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/php5 (Old) and /work/SRC/openSUSE:Factory/.php5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "php5" Changes: -------- --- /work/SRC/openSUSE:Factory/php5/php5.changes 2014-02-09 13:17:59.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.php5.new/php5.changes 2014-02-26 23:20:33.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Feb 11 00:21:52 UTC 2014 - [email protected] + +- Fix build on non-systemd distros (esp. SLES 11) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ php5.spec ++++++ --- /var/tmp/diff_new_pack.jT8Evg/_old 2014-02-26 23:20:34.000000000 +0100 +++ /var/tmp/diff_new_pack.jT8Evg/_new 2014-02-26 23:20:34.000000000 +0100 @@ -340,7 +340,14 @@ Provides: php-simplexml Provides: php-spl Provides: php-xml +%if 0%{suse_version} > 1130 +%define with_systemd 1 +%{systemd_requires} BuildRequires: pkgconfig(libsystemd-daemon) +%else +# <= 11.3 or SLES 11 +%define with_systemd 0 +%endif %description fpm PHP is a server-side, cross-platform HTML embedded scripting language. @@ -1452,7 +1459,9 @@ --disable-all \ Build fpm \ +%if %{with_systemd} --with-fpm-systemd \ +%endif --enable-fpm \ --bindir=%{_bindir} \ --disable-cli \ @@ -1661,7 +1670,16 @@ #install fpm init script. install -d %{buildroot}%{_sysconfdir}/init.d install -m 755 -c %{S:8} %{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 +ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rcphp-fpm +%else +ln -s /sbin/service %{buildroot}%{_sbindir}/rcphp-fpm +%endif +%else +ln -s %{_sysconfdir}/init.d/php-fpm %{buildroot}%{_sbindir}/rcphp-fpm +%endif %post -n apache2-mod_php5 #some distro versions does not have this tool. @@ -1684,6 +1702,7 @@ fi fi +%if %{with_systemd} %pre fpm %service_add_pre php-fpm.service @@ -1699,6 +1718,17 @@ %post fpm %service_add_post php-fpm.service %{fillup_and_insserv -f php-fpm} +%else +%postun fpm +%restart_on_update php-fpm +%insserv_cleanup + +%preun fpm +%stop_on_removal php-fpm + +%post fpm +%{fillup_and_insserv -f php-fpm} +%endif %files %defattr(-, root, root) @@ -1746,9 +1776,12 @@ %config %{php_sysconf}/fpm/php-fpm.conf.default %{_mandir}/man8/php-fpm.8.gz %config /etc/init.d/php-fpm +%{_sbindir}/rcphp-fpm %dir /usr/share/php5/fpm /usr/share/php5/fpm/status.html +%if %{with_systemd} %{_unitdir}/php-fpm.service +%endif %files -n apache2-mod_php5 %defattr(644,root,root,755) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
