Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	php5.spec
@@ -104,7 +104,7 @@ Source8: php-fpm-www.conf Source9: php-fpm.init Source10: php-fpm.logrotate -Source11: sysconfig.phpfpm +Source11: sysconfig.php-fpm Source99: php5-rpmlintrc #SUSE specific stuff Patch2: php5-phpize.patch @@ -1586,7 +1586,7 @@ install -m 644 %{S:10} %{buildroot}%{_sysconfdir}/logrotate.d/php-fpm # sysconfig -install -D -m 644 %{S:11} %{buildroot}/var/adm/fillup-templates/sysconfig.phpfpm +install -D -m 644 %{S:11} %{buildroot}/var/adm/fillup-templates/sysconfig.php-fpm %post update-alternatives --install %{_bindir}/php php %{_bindir}/php5 5 \ @@ -1671,7 +1671,7 @@ fi %post fpm -%{fillup_and_insserv php-fpm} +%{fillup_and_insserv -n php-fpm} update-alternatives --install %{_sbindir}/php-fpm php-fpm %{_sbindir}/php-fpm5 5 update-alternatives --auto php-fpm @@ -1730,7 +1730,7 @@ /usr/share/php5/fpm/status.html %attr(770,wwwrun,www) %dir %{_localstatedir}/log/php-fpm %dir %{_localstatedir}/run/php-fpm -/var/adm/fillup-templates/sysconfig.phpfpm +/var/adm/fillup-templates/sysconfig.php-fpm %files -n apache2-mod_php5 %defattr(644,root,root,755)
[-] [+]	Changed	php-fpm.init ^
@@ -126,7 +126,7 @@ FPM_CONFIG="--fpm-config /etc/php5/fpm/php-fpm.conf" -[ -f /etc/sysconfig/phpfpm ] && . /etc/sysconfig/phpfpm +[ -f /etc/sysconfig/php-fpm ] && . /etc/sysconfig/php-fpm # Source LSB init functions # providing start_daemon, killproc, pidofproc,
[-] [+]	Added	sysconfig.php-fpm ^
@@ -0,0 +1,18 @@ +## Path: Network/WWW/php +## Description: FPM Config +## Type: string +## Default: "" +## ServiceRestart: php-fpm +# +# Options for php-fpm +# +FPM_CONFIG="--fpm-config /etc/php5/fpm/www.conf" +## Path: Network/WWW/php +## Description: FPM additional options +## Type: string +## Default: "" +## ServiceRestart: php-fpm +# +# Options for php-fpm +# +FPM_OPTIONS=""
[-] [+]	Deleted	sysconfig.phpfpm ^
@@ -1,18 +0,0 @@ -## Path: Network/WWW/php -## Description: FPM Config -## Type: string -## Default: "" -## ServiceRestart: php-fpm -# -# Options for php-fpm -# -FPM_CONFIG="--fpm-config /etc/php5/fpm/www.conf" -## Path: Network/WWW/php -## Description: FPM additional options -## Type: string -## Default: "" -## ServiceRestart: php-fpm -# -# Options for php-fpm -# -FPM_OPTIONS=""