--- rpms/smeserver-horde/sme10/smeserver-horde.spec 2017/04/12 22:26:58 1.5 +++ rpms/smeserver-horde/sme10/smeserver-horde.spec 2020/03/11 05:09:48 1.12 @@ -4,14 +4,21 @@ Summary: e-smith specific Horde configur %define name smeserver-horde Name: %{name} %define version 1.0.0 -%define release 5 +%define release 12 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz Patch0: smeserver-horde-1.0.0-bz10092-smtpdORqpsmtpd.patch -#Patch1: e-smith-horde-4.8.0_renumber_database_creation.order.patch +Patch1: smeserver-horde-bz10717-config.phphorde5.2.14compliance.patch +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 +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 @@ -50,12 +57,26 @@ Requires: php-pear-MDB2 Requires: php-pear-Net-URL2 Requires: php-pear-XML-Parser2 Requires: php-pear-XML-RPC2 -Requires: php-pear-Math_BigInteger %changelog +* Wed Mar 11 2020 Jean-Philipe Pialasse 1.0.0-12.sme +- fix typo in php-fpm patch [SME: 10872] + +* Tue Mar 10 2020 Jean-Philipe Pialasse 1.0.0-11.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] + * Wed Apr 12 2017 Jean-Philipe Pialasse 1.0.0-5.sme - fix incorrect expansion of backends.local.php with non numerical releases [SME: 10092] -- add requires php-pear-Math_BigInteger [SME: 9645] +- add requires php-pear-Math_BigInteger [SME: 9600] * Sun Jul 24 2016 Jean-Philipe Pialasse 1.0.0-4.sme - added last optionals dependencies [SME: 9645] @@ -79,7 +100,17 @@ to work on SME Server 10 %prep %setup %patch0 -p1 -#%patch1 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +mkdir -p root/var/lib/php/horde/session +mkdir -p root/var/lib/php/horde/opcache +mkdir -p root/var/lib/php/horde/tmp %build for i in post-install post-upgrade @@ -91,7 +122,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