/[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.13 by jpp,
Thu Mar 26 04:57:43 2020 UTC
+Revision 1.26 by jpp,
Wed Jan 27 20:08:47 2021 UTC
 Line 1
  %define version 3.0.0
- %define release 11
+ %define release 23
  %define name smeserver-php
 Line 20 
 Patch6: smeserver-php-fpm-0.1.1-bz10335-
  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
+ Patch16: smeserver-php-3.0.0-bz11325-logging.patch
  BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
  BuildArch: x86_64
-Line 28 
 BuildRequires: e-smith-devtools
+Line 35 
 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 213 
 Manage PHP FPM pools, and switch between
+Line 221 
 Manage PHP FPM pools, and switch between
  %patch7 -p1
  %patch8 -p1
  %patch9 -p1
+ %patch10 -p1
+ %patch11 -p1
+ %patch12 -p1
+ %patch13 -p1
+ %patch14 -p1
+ %patch15 -p1
+ %patch16 -p1
  %build
  perl createlinks
-Line 223 
 perl createlinks
+Line 238 
 perl createlinks
  #%{__mkdir_p} root/%{_unitdir}/php-fpm.service.d/
  #echo '' >  root/%{_unitdir}/php-fpm.service.d/php-fpm.conf
  #enable by default
- %{__mkdir_p} root/%{_presetdir}
+ #%{__mkdir_p} root/%{_presetdir}
- echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
+ #echo 'enable php-fpm.service' >root/%{_presetdir}/80-koozali-php.preset
+ #drop in systemd file
+ %{__mkdir_p} root/usr/lib/systemd/system/php-fpm.service.d
+ echo "[Install]" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
+ echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php-fpm.service.d/51koozali.conf
+ %{__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 240 
 echo 'service'> root/etc/e-smith/db/conf
+Line 261 
 echo 'service'> root/etc/e-smith/db/conf
  #%{__mkdir_p} root/%{_unitdir}/php$phpver-php-fpm.service.d/
  #echo '' >  root/%{_unitdir}/php$phpver-php-fpm.service.d/php$phpver-php-fpm.conf
- #enable by default php fpm
+ ##enable by default php fpm
- echo 'enable php'$phpver'-php-fpm.service' >>root/%{_presetdir}/80-koozali-php.preset
+ #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
+ #drop in systemd file
+ %{__mkdir_p} root/usr/lib/systemd/system/php$phpver-php-fpm.service.d
+ echo "[Install]" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
+ echo "WantedBy=sme-server.target" > root/usr/lib/systemd/system/php$phpver-php-fpm.service.d/51koozali.conf
  done
  #to add a new php version
-Line 299 
 rm -rf $RPM_BUILD_ROOT
+Line 329 
 rm -rf $RPM_BUILD_ROOT
  %preun
  %changelog
+ * Wed Jan 27 2021 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-23.sme
+ - fix php55 logrotate [SME: 11325]
+ - cleanup remove services in sme-server.target.wants [SME: 10956]
+ - remove usr/lib preset file from rpm [SME: 10958]
+ * Fri Dec 25 2020 Jean-Philipe Pialasse <tests@pialasse.com> 3.0.0-22.sme
+ - add WantedBy=sme-server.target for all php-fpm service files [SME: 11294]
+ * 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]

 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