[arch-commits] Commit in php/trunk (PKGBUILD php-fpm.service)

[Pierre Schmitz]

    Date: Sunday, May 12, 2013 @ 13:18:44
  Author: pierre
Revision: 185245

upgpkg: php 5.4.15-3

move binaries from bin to sbin

Modified:
  php/trunk/PKGBUILD
  php/trunk/php-fpm.service

-----------------+
 PKGBUILD        |    7 ++++---
 php-fpm.service |    2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 11:04:34 UTC (rev 185244)
+++ PKGBUILD	2013-05-12 11:18:44 UTC (rev 185245)
@@ -22,7 +22,7 @@
          'php-tidy'
          'php-xsl')
 pkgver=5.4.15
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 license=('PHP')
 url='http://www.php.net'
@@ -38,7 +38,7 @@
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '5c1f4c967b66ce3eaf819b46951dcbf5'
          'e036c721e5ad927cd1613c7475a58b3a'
-         'f8b206cb8fecb05cb1ded8bee45633ff'
+         '4af4d94f3db58437eef8db87d16a5fab'
          'c60343df74f8e1afb13b084d5c0e47ed')
 
 prepare() {
@@ -52,6 +52,7 @@
 	local _phpconfig="--srcdir=../${pkgbase}-${pkgver} \
 		--config-cache \
 		--prefix=/usr \
+		--sbindir=/usr/bin \
 		--sysconfdir=/etc/php \
 		--localstatedir=/var \
 		--with-layout=GNU \
@@ -239,7 +240,7 @@
 	backup=('etc/php/php-fpm.conf')
 	install='php-fpm.install'
 
-	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/sbin/php-fpm
+	install -D -m755 ${srcdir}/build-fpm/sapi/fpm/php-fpm ${pkgdir}/usr/bin/php-fpm
 	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.8 ${pkgdir}/usr/share/man/man8/php-fpm.8
 	install -D -m644 ${srcdir}/build-fpm/sapi/fpm/php-fpm.conf ${pkgdir}/etc/php/php-fpm.conf
 	install -D -m644 ${srcdir}/logrotate.d.php-fpm ${pkgdir}/etc/logrotate.d/php-fpm

Modified: php-fpm.service
===================================================================
--- php-fpm.service	2013-05-12 11:04:34 UTC (rev 185244)
+++ php-fpm.service	2013-05-12 11:18:44 UTC (rev 185245)
@@ -6,7 +6,7 @@
 Type=forking
 PIDFile=/run/php-fpm/php-fpm.pid
 PrivateTmp=true
-ExecStart=/usr/sbin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
+ExecStart=/usr/bin/php-fpm --daemonize --pid /run/php-fpm/php-fpm.pid
 ExecReload=/bin/kill -USR2 $MAINPID
 
 [Install]