--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec 2020/12/16 12:16:02 1.5 +++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec 2020/12/17 12:53:08 1.6 @@ -1,4 +1,4 @@ -# $Id: smeserver-phpmyadmin.spec,v 1.4 2020/12/01 07:23:40 brianr Exp $ +# $Id: smeserver-phpmyadmin.spec,v 1.5 2020/12/16 12:16:02 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 6 +%define release 7 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -17,7 +17,7 @@ BuildRoot: /var/tmp/%{name}-%{version}-% BuildArchitectures: noarch Requires: e-smith-base Requires: phpMyAdmin >= 4.4.15.10 -Requires: e-smith-release >= 9.0 +Requires: e-smith-release >= 10.0 Obsoletes: phpmyadmin,phpMyAdmin3 BuildRequires: e-smith-devtools Obsoletes: e-smith-phpmyadmin @@ -25,14 +25,19 @@ Obsoletes: smeserver-phpmyadmin <= 3.5.2 Obsoletes: smeserver-phpmyadmin-multiuser 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 %description Implementation of phpMyAdmin for SME Server. Access with admin username/password via: https://yourdomain/phpmyadmin. %changelog +* Thu Dec 17 2020 John Crisp 4.0.10.2-7.sme +- fix BlowfishSecret [SME: 11043] +- Update minimum e-smith release version + * Wed Dec 16 2020 John Crisp 4.0.10.2-6.sme -- fix patch file typo +- fix patch file typo [SME: 11043] * Sun Nov 29 2020 Brian Read 4.0.10.2-5.sme - Change httpd frament to php-fpw and add in .user.ini to set php vars [SME: 11043] @@ -122,6 +127,7 @@ Access with admin username/password via: %prep %setup %patch0 -p1 +%patch1 -p1 %build %{__mkdir_p} root/var/lib/phpMyAdmin/tmp