diff --git a/smeserver-php-fpm.spec b/smeserver-php-fpm.spec index eb311c9..d237043 100644 --- a/smeserver-php-fpm.spec +++ b/smeserver-php-fpm.spec @@ -1,5 +1,5 @@ %define version 0.0.1 -%define release 0.beta4 +%define release 0.beta7 %define name smeserver-php-fpm @@ -16,7 +16,31 @@ BuildArchitectures: noarch BuildRequires: e-smith-devtools Requires: e-smith-base >= 5.6.0 -Requires: mod_proxy_fcgi +%if 0%{?rhel} >= 7 +Requires: mod_fastcgi +%endif + +# Stock PHP +Requires: php-cli +Requires: php-ldap +Requires: php-imap +Requires: php-gd +Requires: php-xml +Requires: php-xmlrpc +Requires: php-soap +Requires: php-opcache +Requires: php-fpm +Requires: php-mbstring +Requires: php-mysql +Requires: php-json +Requires: php-bcmath +Requires: php-intl +Requires: php-mcrypt +Requires: php-pear +Requires: php-process +Requires: php-snmp + +# PHP 5.6 Requires: php56-php-cli Requires: php56-php-ldap Requires: php56-php-imap @@ -44,6 +68,9 @@ Manage PHP FPM pools, and switch between PHP versions easily %build perl createlinks +%{__mkdir_p} root/www/php-cgi-bin/ +%{__mkdir_p} root/var/log/php/php/ +%{__mkdir_p} root/var/lib/php/php/{session,tmp,opcache,wsdlcache} %{__mkdir_p} root/var/log/php/php56/ %{__mkdir_p} root/var/lib/php/php56/{session,tmp,opcache,wsdlcache} @@ -52,11 +79,16 @@ perl createlinks (cd root; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT) /bin/rm -f %{name}-%{version}-filelist /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --dir /var/log/php/php56/ 'attr(root,www,0770)' \ - --dir /var/lib/php/php56/session 'attr(root,www,0770)' \ - --dir /var/lib/php/php56/tmp 'attr(root,www,0770)' \ - --dir /var/lib/php/php56/opcache 'attr(root,www,0770)' \ - --dir /var/lib/php/php56/wsdlcache 'attr(root,www,0770)' \ + --dir /var/log/php/php/ 'attr(0770,root,www)' \ + --dir /var/lib/php/php/session 'attr(0770,root,www)' \ + --dir /var/lib/php/php/tmp 'attr(0770,root,www)' \ + --dir /var/lib/php/php/opcache 'attr(0770,root,www)' \ + --dir /var/lib/php/php/wsdlcache 'attr(0770,root,www)' \ + --dir /var/log/php/php56/ 'attr(0770,root,www)' \ + --dir /var/lib/php/php56/session 'attr(0770,root,www)' \ + --dir /var/lib/php/php56/tmp 'attr(0770,root,www)' \ + --dir /var/lib/php/php56/opcache 'attr(0770,root,www)' \ + --dir /var/lib/php/php56/wsdlcache 'attr(0770,root,www)' \ > %{name}-%{version}-filelist %clean