Kolab Groupware OBS

roundcubemail.spec Changed

@@ -48,7 +48,7 @@
 %global logdir /var/log/roundcubemail
 %global tmpdir /var/lib/roundcubemail
 
-%global rc_version 1.4.11.20
+%global rc_version 1.4.13
 %global plugin_version 3.5.9
 #%%global rc_rel_suffix rc2.12
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
@@ -57,7 +57,7 @@
 Name:           roundcubemail
 Version:        %{rc_version}
 
-Release:        1%{?dot_rel_suffix}%{?dist}
+Release:        2%{?dot_rel_suffix}%{?dist}
 
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
 
@@ -217,8 +217,7 @@
 cp -vf %{SOURCE102} plugins/password/config.inc.php.dist
 cp -vf %{SOURCE103} plugins/calendar/config.inc.php.dist
 cp -vf %{SOURCE104} plugins/kolab_addressbook/config.inc.php.dist
-#TODO?
-#cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
+cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
 cp -vf %{SOURCE106} plugins/kolab_folders/config.inc.php.dist
 cp -vf %{SOURCE107} plugins/libkolab/config.inc.php.dist
 %endif
@@ -549,6 +548,9 @@
 %dir %{_localstatedir}/lib/rpm-state/roundcubemail/
 
 %changelog
+* Tue Nov  30 2021 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.4.11.20-2
+- Selfcontained build
+
 * Wed Sep  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.11.20-1
 - Check in release 1.4.11.20

buildroundcubemailtarball.sh Changed

@@ -2,10 +2,16 @@
 
 set -e
 
-VERSION=1.4.11.20
+VERSION=1.4.13
+GIT_REF=1.4.13
 NAME=roundcubemail-$VERSION
 PLESK_SKIN="roundcubemail-skin-plesk-0.4.0"
-LESSC=~/node_modules/less/bin/lessc
+
+if [ -x "/usr/local/bin/lessc" ]; then
+    LESSC=/usr/local/bin/lessc
+else
+    LESSC=~/node_modules/less/bin/lessc
+fi
 
 
 ROOT_DIR=$(pwd)
@@ -41,6 +47,13 @@
         },
         {
             "type": "path",
+            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_auth",
+            "options": {
+                "symlink": false
+            }
+        },
+        {
+            "type": "path",
             "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_config",
             "options": {
                 "symlink": false
@@ -144,15 +157,19 @@
         "kolab/calendar": "~3.5.9",
         "kolab/kolab_activesync": "~3.5.6",
         "kolab/kolab_addressbook": "~3.5.6",
+        "kolab/kolab_auth": "~3.5.6",
+        "kolab/kolab_chat": "~3.5.2",
         "kolab/kolab_config": "~3.4.0",
         "kolab/kolab_files": "~3.5.2",
         "kolab/kolab_folders": "~3.5.2",
         "kolab/kolab_notes": "~3.5.5",
         "kolab/kolab_tags": "~3.5.2",
+        "kolab/net_ldap3": "~1.1.1",
         "kolab/odfviewer": "~3.4.0",
         "kolab/pdfviewer": "~3.4.0",
         "kolab/tasklist": "~3.5.9",
         "johndoh/contextmenu": "~3.2.1",
+        "zf1/zend-json": "~1.12.11",
         "zf1/zend-log": "~1.12.11",
         "zf1/zend-controller": "~1.12.11",
         "sabre/dav" : "~2.1.6",
@@ -163,7 +180,6 @@
         "phpunit/phpunit": "^4.8.36 || ^5.7.21"
     },
     "suggest": {
-        "kolab/net_ldap3": "~1.1.1 required for connecting to LDAP",
         "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"
     }
 }
@@ -172,6 +188,9 @@
 rm -f $NAME.tar.gz
 [ -d "$NAME" ] && rm -rf "$NAME"
 git clone --branch release-1.4 https://github.com/roundcube/roundcubemail.git $NAME
+pushd $NAME
+git reset --hard $GIT_REF
+popd
 
 [ -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
@@ -250,6 +269,6 @@
 
 popd
 
-tar czf "$ROOT_DIR/$NAME.tar.gz" $NAME
+tar --exclude="$NAME/.git" -czf "$ROOT_DIR/$NAME.tar.gz" $NAME
 
 cd "$PWD"

debian.changelog Changed

roundcubemail-1.4.11.20.tar.gz -> roundcubemail-1.4.13.tar.gz Changed

roundcubemail.dsc Changed

Changes of Revision 2