--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec 2020/12/17 12:53:08 1.6 +++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec 2020/12/18 15:44:29 1.7 @@ -1,4 +1,4 @@ -# $Id: smeserver-phpmyadmin.spec,v 1.5 2020/12/16 12:16:02 jcrisp Exp $ +# $Id: smeserver-phpmyadmin.spec,v 1.6 2020/12/17 12:53:08 jcrisp Exp $ # Authority: darrellmay # Name: Darrell May @@ -6,7 +6,7 @@ Summary: phpMyAdmin for SME Server %define name smeserver-phpmyadmin Name: %{name} %define version 4.0.10.2 -%define release 7 +%define release 8 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -26,12 +26,17 @@ Obsoletes: smeserver-phpmyadmin-multiuse Patch0: smeserver-phpmyadmin-4.0.10.2-Update-httpd-for-php-fpw-and-add-unit-file.patch Patch1: smeserver-phpmyadmin-4.0.10.2-bz11043-add-blowfishsecret.patch +Patch2: smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch %description Implementation of phpMyAdmin for SME Server. Access with admin username/password via: https://yourdomain/phpmyadmin. %changelog +* Fri Dec 18 2020 John Crisp 4.0.10.2-8.sme +- add php pool template and remove disable unit.ini +- Fix version to PHP73 - any higher needs a newer version of phpMyAdmin + * Thu Dec 17 2020 John Crisp 4.0.10.2-7.sme - fix BlowfishSecret [SME: 11043] - Update minimum e-smith release version @@ -128,6 +133,7 @@ Access with admin username/password via: %setup %patch0 -p1 %patch1 -p1 +%patch2 -p1 %build %{__mkdir_p} root/var/lib/phpMyAdmin/tmp @@ -140,6 +146,7 @@ rm -f %{name}-%{version}-filelist /bin/rm -f %{name}-%{version}-filelist /sbin/e-smith/genfilelist \ --dir /var/lib/phpMyAdmin/tmp 'attr(0770,root,www)' \ + --dir /var/log/php/phpmyadmin 'attr(0755,www,www)' \ $RPM_BUILD_ROOT > %{name}-%{version}-filelist echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist echo "%doc phpmyadmin.sql" >> %{name}-%{version}-filelist