--- rpms/smeserver-horde/sme10/smeserver-horde.spec 2020/01/28 21:20:03 1.7 +++ rpms/smeserver-horde/sme10/smeserver-horde.spec 2020/03/10 18:11:49 1.9 @@ -4,7 +4,7 @@ Summary: e-smith specific Horde configur %define name smeserver-horde Name: %{name} %define version 1.0.0 -%define release 7 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -15,7 +15,10 @@ Patch1: smeserver-horde-bz10717-config.p Patch2: smeserver-horde-1.0.0-bz10092-spam_learning.patch Patch3: smeserver-horde-1.0.0-bz10717-activesync_turba_backends.local.php.patch Patch4: smeserver-horde-1.0.0-bz10717-task_sharing.patch -#Patch1: e-smith-horde-4.8.0_renumber_database_creation.order.patch +Patch5: smeserver-horde-1.0.0-bz10866-php3.patch +Patch6: smeserver-horde-1.0.0-bz10823-strict-warming.patch +Patch7: smeserver-horde-1.0.0-bz10872-enable-php-fpm.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base >= 4.9.44, php-horde-horde >= 5.2, mariadb @@ -56,8 +59,14 @@ Requires: php-pear-XML-Parser2 Requires: php-pear-XML-RPC2 %changelog -* Tue Jan 28 2020 Jean-Philipe Pialasse 1.0.0-7.sme +* Tue Mar 10 2020 Jean-Philipe Pialasse 1.0.0-9.sme +- remove php3 references [SME: 10866] +- remove strict and warning alert from error log [SME: 10823] +- dedicated php-fpm pool for horde [SME: 10872] + +* Tue Jan 28 2020 Jean-Philipe Pialasse 1.0.0-8.sme - apply patches from John H. Bennett III [SME: 10717] +- cvs admin -ko on patch1 * Fri Apr 14 2017 Jean-Philipe Pialasse 1.0.0-6.sme - revert requires php-pear-Math_BigInteger provided by php-phpseclib-math-biginteger [SME: 9600] @@ -92,6 +101,13 @@ to work on SME Server 10 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +mkdir -p /var/lib/php/horde/session +mkdir -p /var/lib/php/horde/opcache +mkdir -p /var/lib/php/horde/tmp %build for i in post-install post-upgrade @@ -103,7 +119,11 @@ perl createlinks %install rm -rf $RPM_BUILD_ROOT (cd root ; find . -depth -print | cpio -dump $RPM_BUILD_ROOT) -/sbin/e-smith/genfilelist $RPM_BUILD_ROOT > %{name}-%{version}-filelist +/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ + --dir /var/lib/php/horde/session 'attr(0770,root,www)' \ + --dir /var/lib/php/horde/tmp 'attr(0770,root,www)' \ + --dir /var/lib/php/horde/opcache 'attr(0770,root,www)' \ +> %{name}-%{version}-filelist echo "%doc COPYING" >> %{name}-%{version}-filelist %clean