Request 3121 (superseded)

roundcubemail.spec Changed

@@ -48,16 +48,15 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
-%global rc_version 1.5
+%global rc_version 1.5.3
 %global plugin_version 3.5.11
 %global skin_version 0.5.0
 #%%global rc_rel_suffix rc2.12
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
 %global dash_rel_suffix %{?rc_rel_suffix:-%{rc_rel_suffix}}
-%global basedir %{name}-%{rc_version}%{?dash_rel_suffix}
 
 Name:           roundcubemail
-Version: 1.5.8.5
+Version:        %{rc_version}
 
 Release:        4%{?dot_rel_suffix}%{?dist}
 
@@ -67,7 +66,7 @@
 License:        GPLv2
 URL:            http://www.roundcube.net
 
-Source0:        roundcubemail-%{rc_version}.tar.gz
+Source0:        roundcubemail-%{version}%{?dash_rel_suffix}.tar.gz
 
 Source20:       roundcubemail.conf
 Source21:       roundcubemail.logrotate
@@ -118,11 +117,12 @@
 Requires:       php-pear >= 1.9.0
 Requires:       php-xml
 Requires:       php-intl
+#TODO exclude on plesk?
 %if 0%{?rhel} > 7
 Requires:       php-json
-%if 0%{?plesk} < 1
 Requires:       php-ldap
-%endif
+Requires:       php-kolab
+Requires:       php-kolabformat
 %endif
 
 %if 0%{?rhel} <= 7
@@ -283,9 +283,9 @@
 Roundcube Webmail for Kolab
 
 %prep
-%setup -q -c "%{basedir}"
+%setup -q -c "%{name}-%{version}%{?dash_rel_suffix}"
 
-pushd %{basedir}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
 cp -vf "%{SOURCE200}" SQL/mysql/
 rm -rvf SQL/mysql/2016081200.sql
@@ -351,9 +351,9 @@
 rm -rf plugins/password/helpers/chpass-wrapper.py
 popd
 
-cp -a %{basedir}/{CHANGELOG.md,LICENSE,README.md} .
+cp -a %{name}-%{version}%{?dash_rel_suffix}/{CHANGELOG.md,LICENSE,README.md} .
 
-rm -rf %{basedir}/plugins/jqueryui/themes/redmond
+rm -rf %{name}-%{version}%{?dash_rel_suffix}/plugins/jqueryui/themes/redmond
 
 
 %build
@@ -372,7 +372,7 @@
     %{buildroot}%{tmpdir}/plugins \
     %{buildroot}%{tmpdir}/plugins/enigma
 
-pushd %{basedir}
+pushd %{name}-%{version}%{?dash_rel_suffix}
 
 %if 0%{?plesk} < 1
 %{__install} -pm 644 %SOURCE20 %{buildroot}%{_ap_sysconfdir}/conf.d
@@ -421,8 +421,8 @@
 
 %{__mkdir_p} ${asset_path}
 
-orig_dir="%{basedir}"
-asset_dir="%{basedir}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
+orig_dir="%{name}-%{version}%{?dash_rel_suffix}"
+asset_dir="%{name}-%{version}%{?dash_rel_suffix}$(echo ${asset_path} | %{__sed} -e 's|%{buildroot}%{datadir}||g')"
 
 # Remove the skins and installer directories from ${orig_dir}
 #TODO?
@@ -492,7 +492,7 @@
 
 
 %check
-pushd %{basedir}/tests
+pushd %{name}-%{version}%{?dash_rel_suffix}/tests
 phpunit --debug || :
 popd
 
@@ -561,39 +561,47 @@
     touch %{_localstatedir}/lib/rpm-state/roundcubemail/httpd.restarted
 fi
 
-
-if  -f "/usr/lib/systemd/system/php-fpm.service" ; then
-    /bin/systemctl reload php-fpm.service || :
-fi
-
 %if 0%{?plesk} > 0 && 0%{?rhel} == 7
 php="/opt/plesk/php/7.4/bin/php"
 # Process all sql updates (requires the php-mysqlnd package for the pdo driver for the system php)
 ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail-%{version}/SQL/ \
-    --package roundcube || :
+    --package roundcube || : \
+    >/dev/null 2>&1
 %else
 php="/usr/bin/php"
 ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
     --dir %{_datadir}/doc/roundcubemail/SQL/ \
-    --package roundcube || :
+    --package roundcube || : \
+    >/dev/null 2>&1
 %endif
 
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/libkolab/SQL/ \
-    --package libkolab || :
 
-${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
-    --dir %{_datadir}/roundcubemail/plugins/calendar/drivers/kolab/SQL/ \
-    --package calendar-kolab || :
+for plugin in $(find /usr/share/roundcubemail/plugins -mindepth 1 -maxdepth 1 -type d | sort); do
+    if  ! -z "$(find ${plugin} -type d -name SQL)" ; then
+        for dir in $(find /usr/share/roundcubemail/plugins/$(basename ${plugin})/ -type d -name SQL); do
+            # Skip plugins with multiple drivers and no kolab driver
+            if  ! -z "$(echo $dir | grep driver)" ; then
+                if  -z "$(echo $dir | grep kolab)" ; then
+                    continue
+                fi
+            fi
+
+            ${php} %{_datadir}/roundcubemail/bin/updatedb.sh \
+                --dir $dir \
+                --package $(basename ${plugin}) \
+                >/dev/null 2>&1 || :
+        done
+    fi
+done
 
 exit 0
 
 %files
 %defattr(-,root,root,-)
-%doc %{basedir}/LICENSE
-%doc %{basedir}/UPGRADING
-%doc %{basedir}/SQL
+%doc %{name}-%{version}%{?dash_rel_suffix}/LICENSE
+%doc %{name}-%{version}%{?dash_rel_suffix}/UPGRADING
+%doc %{name}-%{version}%{?dash_rel_suffix}/SQL
 
 %{_datadir}/%{name}/
 %{_sharedstatedir}/%{name}/

Dockerfile Deleted

Makefile Deleted

buildroundcubemailtarball.sh Changed

@@ -3,8 +3,8 @@
 set -e
 set -x
 
-VERSION=1.5
-GIT_REF=dev/kolab-$VERSION
+VERSION=1.5.3
+GIT_REF=dev/kolab-1.5
 PLUGINS_GIT_REF=master
 NAME=roundcubemail-$VERSION
 source buildroundcubemailtarball.config
@@ -23,9 +23,6 @@
     "config": {
         "platform": {
             "php": "7.2.24"
-        },
-        "allow-plugins": {
-            "roundcube/plugin-installer": true
         }
     },
     "repositories": 
@@ -142,45 +139,12 @@
             }
         },
         {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_2fa",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/logon_page",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/nextcloud_link",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "path",
-            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_sso",
-            "options": {
-                "symlink": false
-            }
-        },
-        {
-            "type": "vcs",
-            "url": "https://git.kolab.org/diffusion/PNL/php-net_ldap.git"
-        },
-        {
             "type": "composer",
             "url": "https://plugins.roundcube.net"
         }
     ,
     "require": {
-        "php": ">=7.2.0",
-        "caxy/php-htmldiff": "0.1.9",
+        "php": ">=7.2.0 <8",
         "pear/pear-core-minimal": "~1.10.1",
         "pear/auth_sasl": "~1.1.0",
         "pear/mail_mime": "~1.10.0",
@@ -204,14 +168,10 @@
         "kolab/kolab_folders": "~3.5.2",
         "kolab/kolab_notes": "~3.5.5",
         "kolab/kolab_tags": "~3.5.2",
-        "kolab/net_ldap3": "dev-master",
+        "kolab/net_ldap3": "~1.1.1",
         "kolab/odfviewer": "~3.4.0",
         "kolab/pdfviewer": "~3.4.0",
         "kolab/tasklist": "~3.5.10",
-        "kolab/kolab_2fa": "~3.5.11",
-        "kolab/kolab_sso": "~3.5.4",
-        "kolab/logon_page": "~3.4.2",
-        "kolab/nextcloud_link": "~1.0",
         "johndoh/contextmenu": "~3.2.1",
         "zf1/zend-json": "~1.12.11",
         "zf1/zend-log": "~1.12.11",
@@ -219,9 +179,7 @@
         "sabre/vobject" : "~4.5.1",
         "sabre/dav" : "~4.0",
         "sabre/http" : "~5.0",
-        "smarty/smarty" : "~3.1.7",
-        "monolog/monolog": "1.2.*",
-        "desarrolla2/cache":  "dev-master"
+        "smarty/smarty" : "~3.1.7"
     },
     "require-dev": {
         "phpunit/phpunit": "^4.8.36 || ^5.7.21",
@@ -237,7 +195,7 @@
 
 rm -f $NAME.tar.gz
  -d "$NAME"  && rm -rf "$NAME"
-git clone --branch dev/kolab-1.5 https://git.kolab.org/source/roundcubemail.git $NAME
+git clone --branch dev/kolab-1.5 https://github.com/cmollekopf/roundcubemail.git $NAME
 pushd $NAME
 git reset --hard $GIT_REF
 popd
@@ -245,11 +203,6 @@
  -d roundcubemail-skin-elastic  && rm -rf roundcubemail-skin-elastic
 git clone --branch master ssh://git@git.kolab.org/source/roundcubemail-skin-elastic.git roundcubemail-skin-elastic
 
- -d roundcubemail-skin-chameleon  && rm -rf roundcubemail-skin-chameleon
-git clone ssh://git.kolab.org/diffusion/RSC/roundcubemail-skin-chameleon.git roundcubemail-skin-chameleon
- -d roundcubemail-skin-chameleon-assets  && rm -rf roundcubemail-skin-chameleon-assets
-git clone ssh://git@git.kolab.org/diffusion/RSCA/roundcubemail-skin-chameleon-assets.git roundcubemail-skin-chameleon-assets
-
  -d roundcubemail-plugins-kolab-latest  && rm -rf roundcubemail-plugins-kolab-latest
 git clone --branch master ssh://git@git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git roundcubemail-plugins-kolab-latest
 pushd roundcubemail-plugins-kolab-latest
@@ -273,7 +226,6 @@
 $LESSC -x styles/print.less > styles/print.css
 $LESSC -x styles/embed.less > styles/embed.css
 popd
-
 $LESSC --clean-css="--s1 --advanced" --rewrite-urls=all plugins/libkolab/skins/elastic/libkolab.less > plugins/libkolab/skins/elastic/libkolab.min.css
 
 bin/updatecss.sh --dir skins/elastic
@@ -282,30 +234,12 @@
 
 # Install skins
 for skin in "${SKINS@}"; do
-    if  -d "roundcubemail-skin-elastic/$skin" ; then
-        cp -r "roundcubemail-skin-elastic/$skin" $NAME/skins/
-    fi
-    if  -d "roundcubemail-skin-chameleon-assets/skins/$skin" ; then
-        cp -r "roundcubemail-skin-chameleon/skins/chameleon" "$NAME/skins/$skin"
-        cp -r "roundcubemail-skin-chameleon-assets/skins/$skin/." "$NAME/skins/$skin"
-    fi
+    cp -r "roundcubemail-skin-elastic/$skin" $NAME/skins/
 done
 
 pushd $NAME
 
-# This is for chameleon skins (just now-larry atm)
-for skin in $(ls -1d skins/* | grep -E '(now-larry)'); do
-    skin=$(basename $skin)
-
-    pushd skins/$skin
-    $LESSC -x styles.less > styles.css
-    $LESSC -x colors.less > colors.css
-    popd
-    bin/updatecss.sh --dir skins/$skin
-done
-
-# This is for all elastic skins
-for skin in $(ls -1d skins/* | grep -vE '(classic|elastic|larry|now-larry)'); do
+for skin in $(ls -1d skins/* | grep -vE '(classic|elastic|larry)'); do
     skin=$(basename $skin)
 
     # Copy elastic skin over $skin (but don't overwrite what already existis)

debian.changelog Changed

debian.control Changed

@@ -25,9 +25,9 @@
             php-pspell,
             ucf,
             ${misc:Depends}
-Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-2fa, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugins-kolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
-Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-2fa, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugins-kolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
-Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core (= 1.5), roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui (= 3.1.12), roundcubemail-plugin-kolab-2fa (= 3.1.12), roundcubemail-plugin-kolab-activesync (= 3.1.12), roundcubemail-plugin-kolab-addressbook (= 3.1.12), roundcubemail-plugin-kolab-auth (= 3.1.12), roundcubemail-plugin-kolab-chat (= 3.1.12), roundcubemail-plugin-kolab-config (= 3.1.12), roundcubemail-plugin-kolab-delegation (= 3.1.12), roundcubemail-plugin-kolab-files (= 3.1.12), roundcubemail-plugin-kolab-folders (= 3.1.12), roundcubemail-plugin-kolab-notes (= 3.1.12), roundcubemail-plugin-kolab-tags (= 3.1.12), roundcubemail-plugin-libcalendaring (= 3.1.12), roundcubemail-plugin-libkolab (= 3.1.12), roundcubemail-plugins-kolab (= 3.1.12), roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
+Replaces: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
+Conflicts: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core, roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui, roundcubemail-plugin-kolab-activesync, roundcubemail-plugin-kolab-addressbook, roundcubemail-plugin-kolab-auth, roundcubemail-plugin-kolab-chat, roundcubemail-plugin-kolab-config, roundcubemail-plugin-kolab-delegation, roundcubemail-plugin-kolab-files, roundcubemail-plugin-kolab-folders, roundcubemail-plugin-kolab-notes, roundcubemail-plugin-kolab-tags, roundcubemail-plugin-libcalendaring, roundcubemail-plugin-libkolab, roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
+Provides: roundcube, roundcube-core, roundcube-mysql, roundcube-pgsql, roundcube-plugins, roundcubemail-core (= 1.5), roundcubemail-plugin-acl, roundcubemail-plugin-archive, roundcubemail-plugin-calendar, roundcubemail-plugin-contextmenu, roundcubemail-plugin-filesystem-attachments, roundcubemail-plugin-jqueryui (= 3.1.12), roundcubemail-plugin-kolab-activesync (= 3.1.12), roundcubemail-plugin-kolab-addressbook (= 3.1.12), roundcubemail-plugin-kolab-auth (= 3.1.12), roundcubemail-plugin-kolab-chat (= 3.1.12), roundcubemail-plugin-kolab-config (= 3.1.12), roundcubemail-plugin-kolab-delegation (= 3.1.12), roundcubemail-plugin-kolab-files (= 3.1.12), roundcubemail-plugin-kolab-folders (= 3.1.12), roundcubemail-plugin-kolab-notes (= 3.1.12), roundcubemail-plugin-kolab-tags (= 3.1.12), roundcubemail-plugin-libcalendaring (= 3.1.12), roundcubemail-plugin-libkolab (= 3.1.12), roundcubemail-plugin-managesieve, roundcubemail-plugin-markasjunk, roundcubemail-plugin-newmail-notifier, roundcubemail-plugin-odfviewer, roundcubemail-plugin-password, roundcubemail-plugin-pdfviewer, roundcubemail-plugin-redundant-attachments, roundcubemail-plugin-tasklist, roundcubemail-plugin-zipdownload, roundcubemail-skin-kolab, roundcubemail-skin-plesk, roundcubemail-skin-plesk-larry
 Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality

debian.tar.gz/roundcubemail.prerm Changed

plesk.acl.inc.php Changed

release.sh Deleted

roundcubemail-1.5.tar.gz -> roundcubemail-1.5.3.tar.gz Changed

roundcubemail.dsc Changed

Overview

Request 3121 (superseded)

Request History