--- rpms/smeserver-roundcube/contribs10/smeserver-roundcube.spec	2022/12/07 20:41:01	1.10
+++ rpms/smeserver-roundcube/contribs10/smeserver-roundcube.spec	2024/03/25 15:25:50	1.22
@@ -1,12 +1,13 @@
 %define name smeserver-roundcube
 %define version 1.2
-%define release 14
+%define release 24
 
 Summary: smserver rpm to setup roundcube, an IMAP mail client
 Name: %{name}
 Version: %{version}
 Release: %{release}%{?dist}
 Source: %{name}-%{version}.tar.gz
+Source1: composer.phar
 License: GNU GPL version 2
 URL: http://www.contribs.org
 Group: SMEserver/addon
@@ -16,10 +17,11 @@ BuildArchitectures: noarch
 BuildRequires: e-smith-devtools
 Requires: e-smith-release >= 10.0
 Requires: e-smith-apache >= 2.6.0-19
-Requires: roundcubemail >= 1.1.3
+Requires: roundcubemail >= 1.6
 Requires: git
 Requires: smeserver-dovecot-extras
 Requires: jq
+Requires: php-kolab-net-ldap3
 #Requires: roundcubemail_plugins
 Obsoletes: roundcube
 AutoReqProv: no
@@ -28,11 +30,41 @@ Patch1: smeserver-roundcube-1.2-Add-upda
 Patch2:  smeserver-roundcube-1.2-bz12059-24syntax.patch
 Patch3: smeserver-roundcube-1.2-bz11430-login.patch
 Patch4: smeserver-roundcube-1.2-bz11430-plugins.patch
+Patch5: smeserver-roundcube-1.2-Update-params-forv1_6-roundcube.patch
+Patch6: smeserver-roundcube-1.2-bz12489-bz12263.patch
+Patch7: smeserver-roundcube-1.2-useSSL.patch
+Patch8: smeserver-roundcube-1.2-rcplugin_update.patch
  
 %description
-smserver rpm to setup the roundcube IMAP mail client.
+smeserver rpm to setup the roundcube IMAP mail client.
 
 %changelog
+* Mon Mar 25 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.2-24.sme
+- fix temp event not ending because of interactive install of plugin [SME: 12530]
+- stop altering php81 ini file [SME: 12529]
+- workaround Composer could not detect the root package [SME: 12531]
+- workaround roundcube/plugin-installer is also a root requirement [SME: 12532]
+
+* Fri Mar 22 2024 Jean-Philippe Pialasse <jpp@koozali.org> 1.2-23.sme
+- fix roundcube unable to send mail after smeserver-qpsmtpd disabling auth on port 25
+
+* Sat Feb 24 2024 Jean-Philippe Pialasse <tests@pialasse.com> 1.2-21.sme
+- add nextcloud_attachements plugin support [SME: 12489]
+- simplify access setting using access(private,public)/status [SME: 12263]
+- Requires roundcube >= 1.6
+  up to php81,   add dedicated php pool
+  using update event to config plugins
+
+* Tue Oct 31 2023 Brian Read <brianr@koozali.org> 1.2-19.sme
+- Update params for changes from v1.6 roundcube [SME: 12415]
+
+* Sun Dec 11 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2-18.sme
+- fix previous patch [SME: 11430]
+
+* Sat Dec 10 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2-17.sme
+- remove sieverules [SME: 11430]
+  change skin on availability for 1.6 
+
 * Wed Dec 07 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2-14.sme
 - fix list of plugins and add composer [SME: 11430]
   do not load in conf plugins without an actual folder.
@@ -179,6 +211,15 @@ smserver rpm to setup the roundcube IMAP
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+rm -rf root/etc/e-smith/templates/usr/share/roundcubemail/plugins/sieverules
+mkdir -p root/usr/local/bin/
+cp %{SOURCE1} root/usr/local/bin/composer
+mkdir -p root/var/lib/php/roundcube/{session,tmp,opcache}
+mkdir -p root/var/log/php/roundcube
+%patch7 -p1
+%patch8 -p1
 
 %build
 perl createlinks
@@ -188,7 +229,12 @@ 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 \
-  --ignoredir /usr/share/roundcubemail \
+   --file /usr/local/bin/composer  'attr(0755,root,www)' \
+   --dir /var/log/php/roundcube  'attr(0755,www,www)' \
+   --dir /var/lib/php/roundcube  'attr(0755,www,www)' \
+   --dir /var/lib/php/roundcube/tmp 'attr(0755,www,www)' \
+   --dir /var/lib/php/roundcube/opcache 'attr(0755,www,www)' \
+   --dir /var/lib/php/roundcube/session 'attr(0755,www,www)' \
   > %{name}-%{version}-filelist
 echo "%doc COPYING"  >> %{name}-%{version}-filelist
 
@@ -201,17 +247,17 @@ rm -rf %{name}-%{version}
 
 %post
 #Update the plugins
-echo ""
-echo "Update the Roundcube Plugins, please wait"
-echo ""
-/usr/bin/rcplugin_update.sh
-echo ""
+# now in smeserver-roundcube-update event
+#echo ""
+#echo "Update the Roundcube Plugins, please wait"
+#echo ""
+#/usr/bin/rcplugin_update.sh
+#echo ""
 
 %postun
 #uninstall
 if [ $1 = 0 ] ; then
- /sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
- /usr/local/bin/svc -h /service/httpd-e-smith
+ /usr/bin/systemctl restart httpd-e-smith
 fi
 
 %files -f %{name}-%{version}-filelist