--- rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec 2021/06/01 17:29:33 1.5 +++ rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec 2021/10/05 18:26:01 1.12 @@ -1,31 +1,44 @@ -# $Id: smeserver-phpldapadmin.spec,v 1.4 2021/06/01 17:17:40 jpp Exp $ +# $Id: smeserver-phpldapadmin.spec,v 1.11 2021/10/04 13:49:59 brianr Exp $ # Authority: nocvs # Name: Michel Van hees -%define phpversion 73 Summary: PhpLdapAdmin for SME server %define name smeserver-phpldapadmin Name: %{name} -%define version 1.5.0 -%define release 3 +%define version 1.6.0 +%define release 4 Version: %{version} Release: %{release}%{?dist} License: Freely distributable Group: Apache Source: %{name}-%{version}.tar.gz #{name}-%{version}.patch.yyyymmddnn -Patch0: smeserver-phpldapadmin-1.5.0-bz11611.patch BuildRoot: /var/tmp/e-smith-buildroot BuildRequires: e-smith-devtools BuildArchitectures: noarch Requires: smeserver-release >= 10 -Requires: phpldapadmin >= 1.2.5 -Requires: php74-php-pecl-mcrypt +Requires: phpldapadmin >= 1.2.6 +Patch0:smeserver-phpldapadmin-1.6.0-Add-in-update-event-and-php-fpm-stuff.patch +Patch1:smeserver-phpldapadmin-1.6.0-password-hash-renamed-in-config.patch +Patch2:smeserver-phpldapadmin-1.6.0-Alter-config-auth-type.patch AutoReqProv: no %changelog -* Tue Jun 01 2021 Jean-Philippe Pialasse 1.5.0-3.sme -- Initial release to contribs10 [SME: 11611] +* Tue Oct 05 2021 Brian Read 1.6.0-4.sme +- Alter auth-type config parameter to cookie from http [SME: 11699] + +* Mon Oct 04 2021 Brian Read 1.6.0-3.sme +- Update config to change password_hash to pla_ [SME: 11699 ] + +* Mon Oct 04 2021 BogusDateBot +- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday, + by assuming the date is correct and changing the weekday. + +* Mon Oct 04 2021 Brian Read 1.6.0-2.sme +- change php to fpm and add -update event to createlinks [SME: 11699] + +* Tue Sep 28 2021 John Crisp 1.6.0-1.sme +- Initial release to contribs10 [SME: 11699] * Sat Aug 22 2015 stephane de Labrusse 1.5.0-2.sme - Initial release to contribs9 @@ -53,15 +66,14 @@ AutoReqProv: no - Use of phpldapadmin 0.9.8.3 %description -SME server - phpmyadmin multiuser for smeserver +SME server - phpldapadmin for smeserver %prep %setup %patch0 -p1 -mkdir -p root/var/lib/php/phpldapadmin/{tmp,opcache,session,wsdlcache} -mkdir -p root/var/log/php/phpldapadmin +%patch1 -p1 +%patch2 -p1 -find . -type f | xargs grep -l ____PHPVERSION____ | xargs sed -i -e 's/____PHPVERSION____/%{phpversion}/g' %build perl createlinks @@ -69,14 +81,7 @@ perl createlinks rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) rm -f %{name}-%{version}-filelist -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ - --dir /var/lib/php/phpldapadmin/ 'attr(0755,root,www)' \ - --dir /var/lib/php/phpldapadmin/tmp 'attr(0770,www,www)' \ - --dir /var/lib/php/phpldapadmin/opcache 'attr(0770,www,www)' \ - --dir /var/lib/php/phpldapadmin/session 'attr(0770,www,www)' \ - --dir /var/lib/php/phpldapadmin/wsdlcache 'attr(0770,www,www)' \ - --dir /var/log/php/phpldapadmin 'attr(0770,root,www)' \ - > %{name}-%{version}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist %clean