--- rpms/smeserver-horde/sme10/smeserver-horde.spec 2016/07/06 07:27:42 1.2 +++ rpms/smeserver-horde/sme10/smeserver-horde.spec 2020/03/20 21:05:45 1.13 @@ -4,13 +4,22 @@ Summary: e-smith specific Horde configur %define name smeserver-horde Name: %{name} %define version 1.0.0 -%define release 2 +%define release 13 Version: %{version} Release: %{release}%{?dist} License: GPL Group: Networking/Daemons Source: %{name}-%{version}.tar.gz -#Patch1: e-smith-horde-4.8.0_renumber_database_creation.order.patch +Patch0: smeserver-horde-1.0.0-bz10092-smtpdORqpsmtpd.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 +Patch8: smeserver-horde-1.0.0-bz10824-warnings_strict.patch + BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base >= 4.9.44, php-horde-horde >= 5.2, mariadb @@ -20,10 +29,67 @@ Obsoletes: horde-h3, e-smith-horde, imp- Obsoletes: ingo-h3, e-smith-ingo, turba-h3, e-smith-turba Obsoletes: kronolith-h3, smeserver-kronolith, nag-h3, smeserver-nag Obsoletes: mnemo-h3, smeserver-mnemo -Requires: php-horde-content, php-horde-imp, php-horde-ingo, php-horde-kronolith, +Requires: php-horde-content, php-horde-imp, php-horde-ingo, php-horde-kronolith Requires: php-horde-mnemo, php-horde-nag, php-horde-turba +# optional functions we provide +Requires: php-horde-Horde-ActiveSync +Requires: php-horde-Horde-Service-Facebook +Requires: php-horde-Horde-Service-Twitter +Requires: php-pear-Date-Holidays-Australia, php-pear-Date-Holidays-Denmark +Requires: php-pear-Date-Holidays-Germany, php-pear-Date-Holidays-Italy +Requires: php-pear-Date-Holidays-Netherlands, php-pear-Date-Holidays-Norway +Requires: php-pear-Date-Holidays-Portugal, php-pear-Date-Holidays-Russia +Requires: php-pear-Date-Holidays-Slovenia, php-pear-Date-Holidays-Sweden +Requires: php-pear-Date-Holidays-France, php-pear-Date-Holidays-Turkey +Requires: php-horde-Horde-Text-Filter-Csstidy +Requires: timeobjects +# maybe not required, but JHB used to have them in previous installs +Requires: php-pear-Auth-SASL2 +Requires: php-pear-Cache-Lite +Requires: php-pear-Console-GetoptPlus +Requires: php-pear-Crypt-Blowfish +Requires: php-pear-File-CSV +Requires: php-pear-File-Util +Requires: php-pear-HTTP +Requires: php-pear-HTTP-Request2 +Requires: php-pear-HTTP_WebDAV_Server +Requires: php-pear-Log +Requires: php-pear-MDB2 +Requires: php-pear-Net-URL2 +Requires: php-pear-XML-Parser2 +Requires: php-pear-XML-RPC2 %changelog +* Fri Mar 20 2020 Jean-Philipe Pialasse 1.0.0-13.sme +- fix warnings and strict message filling error.log [SME: 10824] + +* 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: 9600] + +* Sun Jul 24 2016 Jean-Philipe Pialasse 1.0.0-4.sme +- added last optionals dependencies [SME: 9645] +- added France Holidays. + +* Wed Jul 06 2016 Jean-Philipe Pialasse 1.0.0-3.sme +- added Requires for pear Dates [SME: 9645] +- Activesync, timeobjects, Facebook. Twitter, Text-Filter + * Wed Jul 06 2016 Jean-Philipe Pialasse 1.0.0-2.sme - add main Required packages php-horde-* [SME: 9645] @@ -37,8 +103,19 @@ to work on SME Server 10 %prep %setup - -#%patch1 -p1 +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -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 @@ -50,7 +127,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