/[smeserver]/rpms/smeserver-php/sme10/smeserver-php.spec

Diff of /rpms/smeserver-php/sme10/smeserver-php.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.9 by jpp,
Wed Mar 25 03:06:31 2020 UTC
+Revision 1.23 by jcrisp,
Mon Dec 21 13:28:54 2020 UTC
 Line 1
  %define version 3.0.0
- %define release 8
+ %define release 21
  %define name smeserver-php
 Line 19 
 Patch5: smeserver-php-fpm-0.1.1-bz0335-f
  Patch6: smeserver-php-fpm-0.1.1-bz10335-fix3-systemd-units.patch
  Patch7: smeserver-php-3.0.0-bz10891-php.ini-allversions.patch
  Patch8: smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch
+ Patch9: smeserver-php-3.0.0-bz8787-phpmail.patch
+ Patch10: smeserver-php-3.0.0-bz11014.sme-server.target.patch
+ Patch11: smeserver-php-3.0.0-bz11087-webapps.patch
+ Patch12: smeserver-php-3.0.0-bz11092.typo-upload.patch
+ Patch13: smeserver-php-3.0.0-bz11173-bz11015-logging.patch
+ Patch14: smeserver-php-3.0.0-bz11267-ibay-php-version.patch
+ Patch15: smeserver-php-3.0.0-bz11287-fix-event-links.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArch: x86_64
-Line 27 
 BuildRequires: e-smith-devtools
+Line 34 
 BuildRequires: e-smith-devtools
  Requires: e-smith-base >= 5.6.0
  Provides: e-smith-php = %{version}-%{release}
  Obsoletes: e-smith-php < %{version}
+ Provides: smeserver-webapps-common
  Requires: tmpwatch
  Requires: logrotate
-Line 211 
 Manage PHP FPM pools, and switch between
+Line 219 
 Manage PHP FPM pools, and switch between
  %patch6 -p1
  %patch7 -p1
  %patch8 -p1
+ %patch9 -p1
+ %patch10 -p1
+ %patch11 -p1
+ %patch12 -p1
+ %patch13 -p1
+ %patch14 -p1
+ %patch15 -p1
  %build
  perl createlinks
-Line 224 
 perl createlinks
+Line 239 
 perl createlinks
  %{__mkdir_p} root/%{_presetdir}
  echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
+ %{__mkdir_p} root/etc/e-smith/templates.metadata/etc/logrotate.d/
  for phpver in "55" "56" "70" "71" "72" "73" "74"; do
  #needed folder
  %{__mkdir_p} root/var/log/php/php$phpver/
-Line 241 
 echo 'service'> root/etc/e-smith/db/conf
+Line 257 
 echo 'service'> root/etc/e-smith/db/conf
  #enable by default php fpm
  echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset
+ #logrotate templates
+ echo 'TEMPLATE_PATH="/etc/logrotate.d/php-fpm"
+ MORE_DATA={ PHP_VERSION => '$phpver'}' > root/etc/e-smith/templates.metadata/etc/logrotate.d/php$phpver-php-fpm
  done
  #to add a new php version
  #php5*
  for phpver in  "55" ; do
  #cp php56 metadata
- cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56 root/etc/e-smith/templates.metadata/opt/remi/php$phpver
+ mkdir -p  root/etc/e-smith/templates.metadata/opt/remi/php$phpver
+ cp -a  root/etc/e-smith/templates.metadata/opt/remi/php56/* root/etc/e-smith/templates.metadata/opt/remi/php$phpver
  #sed inplace
  find root/etc/e-smith/templates.metadata/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/56/'$phpver'/g'
  done
-Line 255 
 done
+Line 276 
 done
  # php7*
  for phpver in  "72" "73" "74"; do
  #cp ph70 metada
- cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70 root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver
+ mkdir -p root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
+ cp -a  root/etc/e-smith/templates.metadata/etc/opt/remi/php70/* root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver/
  #sed inplace
  find root/etc/e-smith/templates.metadata/etc/opt/remi/php$phpver  -type f -print0 | xargs -0 sed -i 's/70/'$phpver'/g'
  done
-Line 295 
 rm -rf $RPM_BUILD_ROOT
+Line 317 
 rm -rf $RPM_BUILD_ROOT
  %preun
  %changelog
+ * Mon Dec 21 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.21.sme
+ - Fix createlinks typo missing event links [SME: 11287]
+ - Fix typo
+ * Thu Dec 17 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.0.0.20.sme
+ - Fix individual PHP version for ibay [SME: 11267]
+ * Sun Dec 13 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-19.sme
+ - fix wrong syntax = in place of eq [SME: 11173]
+   thanks to Terry Fage
+ * Mon Dec 07 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-18.sme
+ - fix logrotate error because parent directory has insecure permissions [SME: 11173]
+ * Wed Nov 18 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-17.sme
+ - fix warning: ~ action is deprecated with rsyslog [SME: 11015]
+ - fix logrotate error because parent directory has insecure permissions [SME: 11173]
+ * Mon Nov 09 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-16.sme
+ - fix typo for upload_tmp_dir [SME: 11092]
+ * Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-15.sme
+ - improve integration of webapps : virtualhost and event [SME: 11087]
+ * Wed Sep 30 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-14.sme
+ - enable php services for sme-server.target [SME: 11014]
+ * Tue Jun 23 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-13.sme
+ - move and fix link to start services units [SME: 10960]
+ * Fri Mar 27 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-12.sme
+ - fix typo in  smeserver-php-3.0.0-bz10904-pass-auth-token-to-fpm.patch [SME: 10904]
+ * Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-11.sme
+ - help monitoring email sent by php [SME: 8787]
+ * Thu Mar 26 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-9.sme
+ - move auto_prepend_file from php.ini to php-fpm.d [SME: 10904]
+   add /usr/share/php in open_basedir if dfined to allow execution of auto_prepend_file
+ - fix templates-metadata path fot php 55 72 73 74
  * Tue Mar 24 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-8.sme
  - transfer SERVER auth variables from httpd server to php-fpm pool [SME: 10904]
    this allow easy auth for php app using httpd auth as if using php module

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1