--- rpms/smeserver-roundcube/contribs8/smeserver-roundcube.spec	2013/10/27 17:48:17	1.1
+++ rpms/smeserver-roundcube/contribs8/smeserver-roundcube.spec	2015/09/17 19:42:54	1.7
@@ -1,6 +1,6 @@
 %define name smeserver-roundcube
 %define version 0.9
-%define release 15
+%define release 20
 
 Summary: smserver rpm to setup roundcube, an IMAP mail client
 Name: %{name}
@@ -12,6 +12,8 @@ Patch1: smeserver-roundcube-0.9-tmp_fold
 Patch2: smeserver-roundcube-0.9-LdapAdressbooks.patch
 Patch3: smeserver-roundcube-0.9-calendar-junk-contextmenu.patch
 Patch4: smeserver-roundcube-0.9-force-https.patch
+Patch5: smeserver-roundcube-0.9-patch1.patch
+Patch6: smeserver-roundcube-0.9-patch6.patch
 License: GNU GPL version 2
 URL: http://www.dungog.net/sme
 Group: SMEserver/addon
@@ -27,6 +29,22 @@ AutoReqProv: no
 smserver rpm to setup the roundcube IMAP mail client.
 
 %changelog
+* Tue Nov 26 2013 JP Pialasse <tests@pialasse.com> 0.9-20.sme
+-reverting patch
+
+* Sun Nov 24 2013 stephane de labrusse <stephdl@de-labrusse.fr> 0.9.19.sme
+- Add Tasklisk from kolab plugin
+
+* Sun Nov 10 2013 JP Pialasse <tests@pialasse.com> 0.9-18.sme
+- cleaning build section [SME: 7981]
+
+* Wed Nov 6 2013 JP Pialasse <tests@pialasse.com> 0.9-17.sme
+- corrected bug: typo in patch1 [SME: 7981]
+
+* Thu Nov 5 2013 JP Pialasse <tests@pialasse.com> 0.9-16.sme
+- corrected bug [SME: 7981]
+- moved out spec file sql init and other event and actions
+
 * Sat Oct 26 2013 stephane de labrusse <stephdl@de-labrusse.fr> 0.9.15
 - Change the version of roundcubemail-plugins-kolab to 3.02 : http://git.kolab.org/roundcubemail-plugins-kolab/
 
@@ -85,18 +103,12 @@ smserver rpm to setup the roundcube IMAP
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+#%patch7 -p1
 
 %build
-#perl createlinks
-mkdir -p          root/etc/e-smith/db/accounts/defaults/roundcube
-echo "reserved" > root/etc/e-smith/db/accounts/defaults/roundcube/type
-
-mkdir -p                       root/etc/e-smith/db/configuration/defaults/roundcube
-echo "RoundCube IMAP Client" > root/etc/e-smith/db/configuration/defaults/roundcube/Name
-echo "global" >      root/etc/e-smith/db/configuration/defaults/roundcube/PublicAccess
-echo "enabled" >               root/etc/e-smith/db/configuration/defaults/roundcube/status
-echo "roundcube" >             root/etc/e-smith/db/configuration/defaults/roundcube/DbName
-echo "roundcube" >             root/etc/e-smith/db/configuration/defaults/roundcube/DbUser
+perl createlinks
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -113,23 +125,7 @@ rm -rf %{name}-%{version}
 %preun
 
 %post
-/etc/e-smith/events/actions/initialize-default-databases
-/sbin/e-smith/expand-template /etc/e-smith/sql/init/80roundcube
-/etc/rc.d/init.d/mysql.init start
-/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf
-/sbin/e-smith/expand-template /opt/roundcube/config/db.inc.php
-/sbin/e-smith/expand-template /opt/roundcube/config/main.inc.php
-/usr/local/bin/svc -h /service/httpd-e-smith
-#load the mysql Table of plugins
-/usr/bin/mysql roundcube < /opt/roundcube/plugins/carddav/dbinit/mysql.sql 
-/usr/bin/mysql roundcube < /opt/roundcube/plugins/calendar/drivers/database/sql/mysql.sql 
-/usr/bin/mysql roundcube < /opt/roundcube/plugins/calendar/drivers/kolab/SQL/mysql.sql 
-
-#show the "config show roundcube"
-echo ""
-echo "see http://wiki.contribs.org/RoundCube"
-echo "current settings 'config show roundcube'..."
-/sbin/e-smith/config show roundcube
+
 
 %postun
 #uninstall