--- rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec 2020/04/13 11:23:29 1.1 +++ rpms/smeserver-phpmyadmin/contribs10/smeserver-phpmyadmin.spec 2023/10/25 19:47:08 1.18 @@ -1,4 +1,4 @@ -# $Id: smeserver-phpmyadmin.spec,v 1.1 2015/08/22 20:16:59 stephdl Exp $ +# $Id: smeserver-phpmyadmin.spec,v 1.17 2022/08/01 03:25:07 jpp 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 3 +%define release 14 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -16,19 +16,58 @@ URL: http://www.phpmyadmin.net/ BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base -Requires: phpMyAdmin >= 4.0.10.1 -Requires: e-smith-release >= 9.0 +Requires: phpMyAdmin >= 4.4.15.10 +Requires: e-smith-release >= 10.0 +Requires: e-smith-apache >= 2.6.0-19 Obsoletes: phpmyadmin,phpMyAdmin3 BuildRequires: e-smith-devtools Obsoletes: e-smith-phpmyadmin Obsoletes: smeserver-phpmyadmin <= 3.5.2.2-1 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 +Patch2: smeserver-phpmyadmin-4.0.10.2-bz11043-configure-php-pool.patch +Patch3: smeserver-phpmyadmin-4.0.10.2-bz11043.patch +Patch4: smeserver-phpmyadmin-4.0.10.2-bz11408-httpport.patch +Patch5: smeserver-phpmyadmin-4.0.10.2-bz12056-httpd24.patch +Patch6: smeserver-phpmyadmin-4.0.10.2-bz12343-private.patch + %description Implementation of phpMyAdmin for SME Server. Access with admin username/password via: https://yourdomain/phpmyadmin. %changelog +* Wed Oct 25 2023 Jean-Philippe Pialasse 4.0.10.2-14.sme +- fix private access not respected for admin [SME: 12343] + +* Sun Jul 31 2022 Jean-Philippe Pialasse 4.0.10.2-13.sme +- update to httpd 2.4 access syntax [SME: 12056] + +* Sat Jul 23 2022 Jean-Philippe Pialasse 4.0.10.2-12.sme +- use $httpPort in place of hardcoded port 80 [SME: 11408] +- update to httpd 2.4 access syntax [SME: 12056] + +* Sun Feb 28 2021 Jean-Philipe Pialasse 4.0.10.2-11.sme +- finish php74 pool integration [SME: 11043] + fixed dir perms + +* Fri Dec 18 2020 John Crisp 4.0.10.2-8.sme +- add php pool template and remove disable unit.ini + +* 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 [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] + +* Mon Apr 13 2020 Jean-Philipe Pialasse 4.0.10.2-4.sme +- first import for contribs10 + * Sat Aug 22 2015 stephane de Labrusse 4.0.10.2-3.sme - Initial release to contribs9 @@ -110,9 +149,17 @@ Access with admin username/password via: %prep %setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 %build -%{__mkdir_p} root/var/lib/phpMyAdmin/tmp +%{__mkdir_p} root/var/lib/php/phpmyadmin/{tmp,session,opcache,wsdlcache} +%{__mkdir_p} root/var/log/php/phpmyadmin perl createlinks %install @@ -121,7 +168,12 @@ rm -f %{name}-%{version}-filelist (cd root ; /usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT) /bin/rm -f %{name}-%{version}-filelist /sbin/e-smith/genfilelist \ - --dir /var/lib/phpMyAdmin/tmp 'attr(0770,root,www)' \ + --dir /var/lib/php/phpmyadmin/ 'attr(0755,root,www)' \ + --dir /var/lib/php/phpmyadmin/tmp 'attr(0770,www,www)' \ + --dir /var/lib/php/phpmyadmin/opcache 'attr(0770,www,www)' \ + --dir /var/lib/php/phpmyadmin/session 'attr(0770,www,www)' \ + --dir /var/lib/php/phpmyadmin/wsdlcache 'attr(0770,www,www)' \ + --dir /var/log/php/phpmyadmin 'attr(0770,root,www)' \ $RPM_BUILD_ROOT > %{name}-%{version}-filelist echo "%doc CHANGELOG.git" >> %{name}-%{version}-filelist echo "%doc phpmyadmin.sql" >> %{name}-%{version}-filelist