--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec 2020/11/08 20:40:43 1.2 +++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec 2022/07/08 16:10:29 1.25 @@ -1,4 +1,4 @@ -%define release 1 +%define release 17 %define version 1.2.0 Summary: Koozali SME Server Nextcloud configuration @@ -7,19 +7,41 @@ Version: %{version} Release: %{release}%{?dist} License: GPL Source: %{name}-%{version}.tar.gz +Patch0: smeserver-nextcloud-1.2.0-bz10876-username-for-ldap.patch +Patch1: smeserver-nextcloud-1.2.0.bz11086-db-phpver-typo.patch +Patch2: smeserver-nextcloud-1.2.0.bz11086-add-missing-conf-details.patch +Patch3: smeserver-nextcloud-1.2.0.bz11171-template-min-max-start-servers.patch +Patch4: smeserver-nextcloud-1.2.0.bz11171-check-min-max-start-servers.patch +Patch5: smeserver-nextcloud-1.2.0.bz11268-fix-typo-php-pool-template.patch +Patch6: smeserver-nextcloud-1.2.0-bz11086.patch +Patch7: smeserver-nextcloud-1.2.0-bz11086-dav-externalfs.patch +Patch8: smeserver-nextcloud-1.2.0-bz11172-logrotate.patch +Patch9: smeserver-nextcloud-1.2.0-bz11920-bz11854-bz11973.patch +Patch10: smeserver-nextcloud-1.2.0-bz11855-gencache.patch +Patch11: smeserver-nextcloud-1.2.0-bz11854.patch +Patch12: smeserver-nextcloud-1.2.0-bz11918-migrateloudDomain2VirtualHost.patch +Patch13: smeserver-nextcloud-1.2.0-bz11343-mariadb105.patch +Patch14: smeserver-nextcloud-1.2.0-bz11972-rewriterules.patch +Patch15: smeserver-nextcloud-1.2.0-bz12094-use-src.patch +Patch16: smeserver-nextcloud-1.2.0-bz12016-backup.patch +Patch17: smeserver-nextcloud-1.2.0-bz12096-bz12095.patch + +# for later smeserver-nextcloud-1.2.0-bz12053-httpd24.patch BuildArch: noarch URL: https://www.nextcloud.com BuildRequires: e-smith-devtools -Requires: nextcloud >= 13.0.1 +Requires: nextcloud-src >= 24.0.1 Requires: e-smith-apache Requires: e-smith-mysql Requires: smeserver-webapps-common -Requires: smeserver-php-fpm >= 0.1.1-3 +Requires: smeserver-php >= 3.0.0-15 Requires: samba-client Requires: perl-JSON +Requires: perl-Exporter-Tiny +Requires: perl-Sub-Quote Requires: php74-php-smbclient Requires: php74-php-opcache Requires: php74-php-pecl-apcu @@ -27,7 +49,10 @@ Requires: php74-php-pecl-inotify Requires: php74-php-pecl-zip Requires: php74-php-pecl-imagick Requires: php74-php-gmp - +Requires: jq +Requires: smeserver-mariadb105 +#httpd24 Requires: e-smith-apache >= 2.6.0-19 +#httpd24 Requires: smeserver-php >= 3.0.0-43 %description Koozali SME Server Nextcloud files and configuration. @@ -35,6 +60,26 @@ Koozali SME Server Nextcloud files and c %prep %setup +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 +%patch8 -p1 +%patch9 -p1 +%patch10 -p1 +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 +%patch16 -p1 +%patch17 -p1 + +# TODO patch httpd24 %build perl createlinks @@ -51,7 +96,11 @@ mkdir -p root/var/log/php/nextcloud --dir /var/lib/php/nextcloud/session 'attr(0755,www,www)' \ --dir /home/e-smith/files/nextcloud 'attr(0755,www,www)' \ --dir /home/e-smith/files/nextcloud/data 'attr(0755,www,www)' \ + --ignoredir "/etc/sudoers.d" \ + --file "/etc/sudoers.d/90_nextcloud" "attr(0440,root,root)" \ --file /usr/bin/OCC 'attr(0755,root,root)'\ + --file /usr/bin/occ 'attr(0755,root,root)'\ + --file /usr/bin/nc_dbupdate 'attr(0755,root,root)'\ > %{name}-%{version}-filelist cat %{name}-%{version}-filelist @@ -61,6 +110,68 @@ cat %{name}-%{version}-filelist %changelog +* Fri Jul 08 2022 Jean-Philippe Pialasse 1.2.0-17.sme +- fix gencache again [SME: 12096] +- fix ldap users/groups not availables on first run [SME: 12095] + +* Thu Jul 07 2022 Jean-Philippe Pialasse 1.2.0-16.sme +- migrate property CloudDomain to VirtualHost [SME: 11918] +- use mariadb105 on new installs [SME: 11343] +- update rewriterules [SME: 11972] +- update to NC24 [SME: 12094] + use a nextcloud-src rpm and avoid conflicts between web and rpm updates +- add to backup [SME: 12016] + +* Fri May 20 2022 Terry Fage 1.2.0-15.sme +- fix cron syntax error [SME: 11854] + +* Wed May 18 2022 Jean-Philippe Pialasse 1.2.0-14.sme +- fix gencache_init failed [SME: 11855] + fix missing nextcloud-conf action in update event + +* Wed May 18 2022 Jean-Philippe Pialasse 1.2.0-12.sme +- use php_pecl-apcu for cli [SME: 11920] +- db update of keys and indexes [SME: 11854] +- few nextcloud-occ-conf fixes [SME: 11973] + make occ used in scripts rather than OCC + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-11.sme +- fix logrotate error [SME: 11172] +- fix noise in error log + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-9.sme +- fix dav redirections for domain use and subdir [SME: 11086] +- refresh externalfs on loading, best for ibays +- tidying + +* Sun Jun 06 2021 Jean-Philippe Pialasse 1.2.0-8.sme +- add update event [SME: 11086] +- add occ as hard link of OCC + +* Fri Dec 18 2020 John Crisp 1.2.0-7.sme +- Fix typo in php pool template [SME: 11268] + +* Tue Dec 01 2020 John Crisp 1.2.0-6.sme +- Add a check for the Min/Max/Start servers [SME: 11171] +- https://bugs.contribs.org/show_bug.cgi?id=11171#c4 + +* Mon Nov 16 2020 John Crisp 1.2.0-5.sme +- Template missing Min/Start/Max Servers and Children [SME: 11171] + +* Thu Nov 12 2020 John Crisp 1.2.0-4.sme +- Add missing SMB configuration details including domain/workgroup + +* Mon Nov 09 2020 John Crisp 1.2.0-3.sme +- Fix sudoer file permissions in file list +- Fix some install bugs +- typo in httpd.conf +- switch db from mysql to maria db +- update php version +- add Requires + +* Sun Nov 08 2020 Jean-Philipe Pialasse 1.2.0-2.sme +- use username as id in place of ldap uuid [SME: 10876] + * Sun Nov 08 2020 Jean-Philipe Pialasse 1.2.0-1.sme - initial SME10 import [SME: 11086]