From fd8f348ce19fc6b450c09f71f074fc148917e733 Mon Sep 17 00:00:00 2001
From: Daniel Berteaud <daniel@firewall-services.com>
Date: Wed, 26 Jul 2017 17:20:31 +0200
Subject: [PATCH] Spec file changes Including build for x86_64 only. While this
 package itself is noarch, it depends on x86_64 only packages

---
 smeserver-php-fpm.spec | 31 +++++++++++++++++++++++++------
 1 file changed, 25 insertions(+), 6 deletions(-)

diff --git a/smeserver-php-fpm.spec b/smeserver-php-fpm.spec
index a9caf6b..55d6801 100644
--- a/smeserver-php-fpm.spec
+++ b/smeserver-php-fpm.spec
@@ -1,5 +1,5 @@
-%define version 0.0.1
-%define release 0.beta7
+%define version 0.1.0
+%define release 1
 %define name smeserver-php-fpm
 
 
@@ -12,14 +12,19 @@ Group: Applications/System
 Source: %{name}-%{version}.tar.gz
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
-BuildArchitectures: noarch
+BuildArch: x86_64
 BuildRequires: e-smith-devtools
 
 Requires: e-smith-base >= 5.6.0
-%if 0%{?rhel} >= 7
+
+# On el7 we can use mod_proxy_fcgi instead
+%if 0%{?rhel} <= 7
 Requires: mod_fastcgi
 %endif
 
+Requires: tmpwatch
+Requires: logrotate
+
 # Stock PHP
 Requires: php-cli
 Requires: php-ldap
@@ -108,11 +113,15 @@ Manage PHP FPM pools, and switch between PHP versions easily
 
 %build
 perl createlinks
-%{__mkdir_p} root/www/php-cgi-bin/
+%{__mkdir_p} root/var/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}
+%{__mkdir_p} root/var/log/php/php70/
+%{__mkdir_p} root/var/lib/php/php70/{session,tmp,opcache,wsdlcache}
+%{__mkdir_p} root/var/log/php/php71/
+%{__mkdir_p} root/var/lib/php/php71/{session,tmp,opcache,wsdlcache}
 
 %install
 /bin/rm -rf $RPM_BUILD_ROOT
@@ -129,6 +138,16 @@ perl createlinks
   --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)' \
+  --dir /var/log/php/php70/ 'attr(0770,root,www)' \
+  --dir /var/lib/php/php70/session 'attr(0770,root,www)' \
+  --dir /var/lib/php/php70/tmp 'attr(0770,root,www)' \
+  --dir /var/lib/php/php70/opcache 'attr(0770,root,www)' \
+  --dir /var/lib/php/php70/wsdlcache 'attr(0770,root,www)' \
+  --dir /var/log/php/php71/ 'attr(0770,root,www)' \
+  --dir /var/lib/php/php71/session 'attr(0770,root,www)' \
+  --dir /var/lib/php/php71/tmp 'attr(0770,root,www)' \
+  --dir /var/lib/php/php71/opcache 'attr(0770,root,www)' \
+  --dir /var/lib/php/php71/wsdlcache 'attr(0770,root,www)' \
   > %{name}-%{version}-filelist
 
 %clean
@@ -144,5 +163,5 @@ rm -rf $RPM_BUILD_ROOT
 %preun
 
 %changelog
-* Sun Jul 2 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.0.1-1.sme
+* Wed Jul 26 2017 Daniel Berteaud <daniel@firewall-services.com> - 0.1.0-1.sme
 - Initial release